bin/parse config/18/files.yml config/18/ignores.yml config/18/include/Aliases.h config/18/include/CodeFragments.h config/18/include/TextUtils.h config/18/include/_structs.h config/18/include/_types.h config/18/include/alloca.h config/18/include/ar.h config/18/include/available.h config/18/include/crt_externs.h config/18/include/ctype.h config/18/include/direct.h config/18/include/dirent.h config/18/include/dlfnc.h config/18/include/errno.h config/18/include/fcntl.h config/18/include/grp.h config/18/include/intrinsics.h config/18/include/limits.h config/18/include/link.h config/18/include/macho-o/dyld.h config/18/include/macruby_private.h config/18/include/math.h config/18/include/ndir.h config/18/include/net/socket.h config/18/include/nlist.h config/18/include/process.h config/18/include/pwd.h config/18/include/ruby.h config/18/include/ruby/config.h config/18/include/ruby/defines.h config/18/include/ruby/dln.h config/18/include/ruby/env.h config/18/include/ruby/intern.h config/18/include/ruby/missing.h config/18/include/ruby/node.h config/18/include/ruby/re.h config/18/include/ruby/regex.h config/18/include/ruby/ruby.h config/18/include/ruby/rubyio.h config/18/include/ruby/rubysig.h config/18/include/ruby/st.h config/18/include/ruby/util.h config/18/include/setjmp.h config/18/include/signal.h config/18/include/st.h config/18/include/stdarg.h config/18/include/stddef.h config/18/include/stdio.h config/18/include/stdlib.h config/18/include/string.h config/18/include/strings.h config/18/include/sys/_select.h config/18/include/sys/_structs.h config/18/include/sys/_types.h config/18/include/sys/cdefs.h config/18/include/sys/cygwin.h config/18/include/sys/dir.h config/18/include/sys/file.h config/18/include/sys/ioctl.h config/18/include/sys/mkdev.h config/18/include/sys/ndir.h config/18/include/sys/param.h config/18/include/sys/resource.h config/18/include/sys/select.h config/18/include/sys/stat.h config/18/include/sys/syscall.h config/18/include/sys/systemcfg.h config/18/include/sys/time.h config/18/include/sys/times.h config/18/include/sys/types.h config/18/include/sys/utime.h config/18/include/sys/wait.h config/18/include/syscall.h config/18/include/time.h config/18/include/unistd.h config/18/include/unix.h config/18/include/util.h config/18/include/utime.h config/18/include/varargs.h config/18/macros.yml config/18/types.yml lib/mri/instrumentation/extensions/parser/function_def.rb lib/mri/instrumentation/parser.rb lib/mri/instrumentation/strategy/stack.rb probes/18/array.yml probes/18/bignum.yml probes/18/compar.yml probes/18/dir.yml probes/18/file.yml probes/18/io.yml probes/18/lex.yml probes/18/math.yml probes/18/numeric.yml probes/18/prec.yml probes/18/process.yml probes/18/random.yml probes/18/range.yml probes/18/re.yml probes/18/signal.yml probes/18/st.yml probes/18/struct.yml probes/18/time.yml probes/18/util.yml translators/18/env.d translators/18/io.d translators/18/node.d translators/18/st.d translators/18/types.d @@ -9,12 +9,19 @@ module Mri MRI_VERSION = RUBY_VERSION.gsub('.','')[0..1] - PROBES = File.join( File.dirname( __FILE__ ), '..', 'probes', MRI_VERSION ).freeze + DIRECTORY = File.expand_path( File.join( File.dirname( __FILE__ ), '..' ) ) + + PROBES = File.join( DIRECTORY, 'probes', MRI_VERSION ).freeze + + CONFIG = File.join( DIRECTORY, 'config', MRI_VERSION ).freeze + + EXTENSIONS = File.join( DIRECTORY, 'lib', 'mri', 'instrumentation', 'extensions' ).freeze autoload :Definition, 'mri/instrumentation/definition' autoload :Probe, 'mri/instrumentation/probe' autoload :Argument, 'mri/instrumentation/argument' autoload :ProbeCollection, 'mri/instrumentation/probe_collection' + autoload :Parser, 'mri/instrumentation/parser' module Strategy @@ -26,6 +33,7 @@ module Mri autoload :Calls, 'mri/instrumentation/strategy/calls' autoload :Speculate, 'mri/instrumentation/strategy/speculate' autoload :Peek, 'mri/instrumentation/strategy/peek' + autoload :Stack, 'mri/instrumentation/strategy/stack' end lib/instrumentation.rb @@ -2,6 +2,9 @@ module Mri module Instrumentation class Argument < Struct.new(:type, :description, :order) + class TypeNotDefined < StandardError + end + class << self # Yields the default probe argument @@ -16,22 +19,76 @@ module Mri # and integers. # - TYPES = { :char => ['copyinstr( %s )', '%s'], - :pointer => ['%s', '%#p'], - :int => ['stringof( %s )', '%s'], - :probe => ['%s', '%s'] } + TYPES = { 'VALUE' => ['%s', 'stringof(%d)'], + 'VALUE *' => ['%s', '%s'], + 'long int' => ['%s', 'stringof(%d)'], + 'void' => ['%s', '%s'], + 'int' => ['%s', 'stringof(%d)'], + 'struct inspect_arg *' => ['%s', '%s'], + 'VALUE (*)()' => ['%s', '%s'], + 'struct ary_sort_data *' => ['%s', '%s'], + 'VALUE (*)(VALUE, long int)' => ['%s', '%s'], + 'void *' => ['%s', '%s'], + 'struct st_hash_type *' => ['%s', '%s'], + 'st_table' => ['%s', '%s'], + 'st_table *' => ['%s', '%s'], + 'st_data_t' => ['%s', '%s'], + 'st_data_t *' => ['%s', '%s'], + 'int (*)()' => ['%s', 'stringof(%d)'], + 'const char *' => ['%s', '%s'], + 'unsigned long int' => ['%s', 'stringof(%d)'], + 'char *' => ['%s', '%s'], + 'unsigned long long int' => ['%s', 'stringof(%d)'], + 'long long int' => ['%s', 'stringof(%d)'], + 'double' => ['%s', 'stringof(%d)'], + 'double *' => ['%s', 'stringof(%d)'], + 'const char **' => ['%s', '%s'], + 'struct dir_data *' => ['%s', '%s'], + 'struct chdir_data *' => ['%s', '%s'], + 'struct stat *' => ['%s', '%s'], + 'DIR *' => ['%s', '%s'], + 'struct glob_pattern *' => ['%s', '%s'], + 'enum answer' => ['%s', '%s'], + 'ruby_glob_func *' => ['%s', '%s'], + 'void (*)(const char *, VALUE)' => ['%s', '%s'], + 'gid_t' => ['%s', '%s'], + 'OpenFile *' => ['%s', '%s'], + 'FILE *' => ['%s', '%s'], + 'ID' => ['%s', 'stringof(%d)'], + 'struct foreach_arg *' => ['%s', '%s'], + 'struct kwtable *' => ['%s', '%s'], + :probe => ['%s', '%s'] + } + + # Hash representation + # + def to_hash + { self.type => self.description } + end + + # YAML representation + # + def to_yaml( opts = {} ) + to_hash.to_yaml + end + + # Type lookup accessor + # + def lookup + TYPES[self.type] || raise( TypeNotDefined, "type not defined #{self.type.inspect}" ) + end # Format helper for D's printf # def to_format - @format ||= TYPES[self.type.to_sym].last + @format ||= lookup.last end # Massage into a format D can easily work with. # Standardized on everything being a string, for the time being. # def massage - @massage ||= TYPES[self.type.to_sym].first % to_arg + @massage ||= lookup.first % to_var( '_copy' ) end # String representation as description @@ -42,14 +99,21 @@ module Mri # Function variable # - def to_var - @to_var ||= probe? ? "this->type" : "this->#{to_arg}" + def to_var( suffix = '' ) + @to_var ||= {} + @to_var[suffix] ||= probe? ? "self->type#{suffix}" : "self->#{to_arg}#{suffix}" end # Function variable assignment # def to_assignment - @to_assignment ||= "#{to_var} = #{massage};" + @to_assignment ||= default_assignment #init_assignment + end + + # Copy argument to a thread local ( pointers ) + # + def to_copy + @to_copy ||= "#{to_var( '_copy' )} = #{to_arg};" end # Argument representation. @@ -64,6 +128,12 @@ module Mri self.order == -1 end + private + + def default_assignment + "#{to_var} = #{massage};" + end + end end end \ No newline at end of file lib/mri/instrumentation/argument.rb @@ -33,12 +33,15 @@ module Mri # Setup all probes # def setup_probes - read.each_pair do |probe, definition| - @probes << setup_probe( probe, - safe_definition( definition, "desc" ), - safe_definition( definition, "args" ), - safe_definition( definition, "return" ) ) - end + read.each do |probe| + probe.each_pair do |probe, definition| + @probes << setup_probe( probe, + safe_definition( definition, "desc" ), + safe_definition( definition, "arguments" ), + safe_definition( definition, "return" ), + safe_definition( definition, "storage" ) ) + end + end end # Don't assume all argument and return definitions is given @@ -49,8 +52,8 @@ module Mri # Setup a single probe # - def setup_probe( probe, description, arguments, returns ) - Mri::Instrumentation::Probe.new( group, probe, description, setup_arguments( arguments ), returns ) + def setup_probe( probe, description, arguments, returns, storage ) + Mri::Instrumentation::Probe.new( group, probe, description, setup_arguments( arguments ), returns, storage ) end # Setup arguments for a single probe lib/mri/instrumentation/definition.rb @@ -1,6 +1,22 @@ module Mri module Instrumentation - class Probe < Struct.new( :group, :name, :probe_description, :arguments, :return ) + class Probe < Struct.new( :group, :name, :probe_description, :arguments, :return, :storage ) + + # Hash representation + # + def to_hash + { self.name => { 'desc' => self.name.to_s, + 'arguments' => self.arguments.map{|a| a.to_hash }, + 'return' => self.return, + 'storage' => self.storage } + } + end + + # YAML representation + # + def to_yaml( opts = {} ) + to_hash.to_yaml + end # Format string representation of the probe name # @@ -21,12 +37,6 @@ module Mri "#{self.name}#{suffix}" end - # True if no explicit return type - # - def void? - @void ||= self.return == 'void' - end - # Argument size # def argument_size @@ -50,6 +60,24 @@ module Mri def function @function ||= "pid$target*:::#{self.name}" end + + # External definition ? + # + def extern? + self.storage == 'extern' + end + + # Static definition ? + # + def static? + self.storage == 'static' + end + + # Should we define a function entry ? + # + def entry? + true + end # Entry declaration # @@ -57,6 +85,12 @@ module Mri @function_entry ||= with_pid( 'entry' ) end + # Should we define a function return ? + # + def return? + self.return != 'void' + end + # Retrun declaration # def function_return @@ -75,6 +109,12 @@ module Mri def assign_arguments iterate_arguments( self.arguments, :to_assignment ) end + + # Copy all arguments + # + def copy_arguments + iterate_arguments( self.arguments, :to_copy ) + end # The argument representing the probe type # lib/mri/instrumentation/probe.rb @@ -2,6 +2,10 @@ module Mri module Instrumentation class ProbeCollection < Array + def to_yaml + self.map{|p| p.to_hash }.to_yaml + end + # Find the largest argument count across all probes # def arguments_size @@ -58,8 +62,8 @@ module Mri # Is all of the returns void ? # - def void? - @void ||= self.all?{|p| p.void? } + def return? + @return ||= self.all?{|p| p.return? } end private lib/mri/instrumentation/probe_collection.rb @@ -18,6 +18,7 @@ module Mri %[ #!/usr/sbin/dtrace -ZFs #pragma D option quiet\n #pragma D option dynvarsize=64m\n + #pragma D option bufsize=16m\n #{body}\n ] end @@ -70,7 +71,7 @@ module Mri # def functions fncs = [:entry] - fncs << :return unless void? + fncs << :return if @probe.return? fncs end @@ -87,6 +88,8 @@ module Mri private + # Shared function template + # def function_template( name, body, predicate_clause = '' ) %[ #{name} #{predicate_clause} lib/mri/instrumentation/strategy/base.rb @@ -8,13 +8,18 @@ module Mri end def entry + super %[ #{copy_arguments} ] + end + + def return super %[ #{assign_arguments} @calls[#{arguments_list( arguments_size )}] = count(); ] end def report super %[ printf(" #{header_format}\\n", #{report_header}, "CALLS"); - printa(" #{report_format}\\n", @calls); ] + /*printa(" #{report_format}\\n", @calls);*/ + printa(@calls); ] end end lib/mri/instrumentation/strategy/calls.rb @@ -10,8 +10,7 @@ module Mri def entry super %[ self->depth++; self->exclude[self->depth] = 0; - #{assign_arguments} - @num[#{arguments_list( arguments_size )}] = count(); + #{copy_arguments} self->#{name}[self->depth] = timestamp; ] end @@ -28,7 +27,7 @@ module Mri #{assign_arguments} @types_incl[#{arguments_list( arguments_size )}] = sum(this->elapsed_incl); @types_excl[#{arguments_list( arguments_size )}] = sum(this->elapsed_excl); - + @num[#{arguments_list( arguments_size )}] = count(); self->depth--; self->exclude[self->depth] += this->elapsed_incl; ] end @@ -43,7 +42,7 @@ module Mri private def exclusive_and_inclusive - if void? + unless return? '' else %[ normalize(@types_excl, 1000); lib/mri/instrumentation/strategy/calltime.rb @@ -9,17 +9,22 @@ module Mri end def setup - super %[ printf("#{probes_collection.format_string( '/s', ' ', :description )}\\n", #{probes_collection.description( '/s', ', ', '"' )});\n ] + super %[ printf("#{probes_collection.format_string( '', ' ', :description )}\\n", #{probes_collection.description( '', ', ', '"' )});\n + self->depth = 0;\n ] end def entry - super %[ printf("%3d %-16d %-22s %*s->\\n", cpu, timestamp / 1000, -probefunc, self->depth * 2, "" );\n ] + super %[ printf("%3d %-16d %*s %-22s ->\\n", cpu, timestamp / 1000, self->depth * 2, "", probefunc );\n + self->depth++; ] end def return - super %[ printf("%3d %-16d %-22s %*s<-\\n", cpu, timestamp / 1000, - probefunc, self->depth * 2, "" );\n ] + super %[ self->depth--; + printf("%3d %-16d %*s %-22s <-\\n", cpu, timestamp / 1000, self->depth * 2, "", probefunc );\n ] + end + + def report + super %[ exit(0); ] end end lib/mri/instrumentation/strategy/flow.rb @@ -33,7 +33,7 @@ module Mri def functions fncs = [:guarded_entry] - fncs.concat( [:peek, :return] ) unless void? + fncs.concat( [:peek, :return] ) if @probe.return? fncs end lib/mri/instrumentation/strategy/peek.rb @@ -44,7 +44,7 @@ module Mri def functions fncs = [:entry] - fncs.concat( [:return_success, :return_failure] ) unless void? + fncs.concat( [:return_success, :return_failure] ) if @probe.return? fncs end lib/mri/instrumentation/strategy/speculate.rb @@ -1,8 +1,17 @@ -rb_memerror: - desc: 'Memory Error' -ruby_xmalloc: - desc: 'Memory allocation' - args: - - int: 'Allocation Size' -rb_newobj: - desc: 'New Object Created' \ No newline at end of file +--- +- rb_memerror: + arguments: + storage: + desc: rb_memerror + return: void +- ruby_xmalloc: + arguments: + - long: size + storage: + desc: ruby_xmalloc + return: void * +- rb_newobj: + arguments: + storage: + desc: rb_newobj + return: VALUE \ No newline at end of file test/fixtures/probes/gc.yml @@ -22,12 +22,12 @@ module Mri def self.arguments [ Mri::Instrumentation::Argument.probe, - Mri::Instrumentation::Argument.new( :pointer, 'Address', 0 ), - Mri::Instrumentation::Argument.new( :int, 'Allocation Size', 1 ) ] + Mri::Instrumentation::Argument.new( 'char *', 'Address', 0 ), + Mri::Instrumentation::Argument.new( 'int', 'Allocation Size', 1 ) ] end def self.probe( args = self.arguments ) - Mri::Instrumentation::Probe.new( :gc, 'ruby_xrealloc', 'Reallocation', args ) + Mri::Instrumentation::Probe.new( :gc, 'ruby_xrealloc', 'Reallocation', args, 'VALUE' ) end # thx ActiveSupport test/helper.rb @@ -3,7 +3,23 @@ require File.join( File.dirname( __FILE__ ), '..', 'helper' ) class ArgumentTest < Test::Unit::TestCase def setup - @argument = Mri::Instrumentation::Argument.new( :char, 'Filename', 0 ) + @argument = Mri::Instrumentation::Argument.new( 'char *', 'Filename', 0 ) + end + + test "should have a hash representation" do + assert_equal( { "char *" => "Filename" }, @argument.to_hash ) + end + + test "should have a yaml representation" do + assert_equal "--- \nchar *: Filename\n", @argument.to_yaml + end + + test "should be able to lookup types" do + assert_equal ['%s', '%s'], @argument.lookup + assert_raises Mri::Instrumentation::Argument::TypeNotDefined do + @argument.type = 'undefined' + @argument.lookup + end end test "should have a string representation" do @@ -15,47 +31,19 @@ class ArgumentTest < Test::Unit::TestCase end test "should have a variable representation" do - assert_equal 'this->arg0', @argument.to_var + assert_equal 'self->arg0', @argument.to_var end test "should be able to massage it's input value" do - assert_equal 'copyinstr( arg0 )', @argument.massage + assert_equal 'self->arg0_copy', @argument.massage end test "should have an assignment representation" do - assert_equal 'this->arg0 = copyinstr( arg0 );', @argument.to_assignment + assert_equal "self->arg0 = self->arg0_copy;", @argument.to_assignment end -end - -class PointerArgumentTest < Test::Unit::TestCase - - def setup - @argument = Mri::Instrumentation::Argument.new( :pointer, 'Address', 1 ) - end - - test "should have a format representation" do - assert_equal '%#p', @argument.to_format - end - - test "should be able to massage it's input value" do - assert_equal 'arg1', @argument.massage - end - -end - -class IntegerArgumentTest < Test::Unit::TestCase - - def setup - @argument = Mri::Instrumentation::Argument.new( :int, 'Allocation Size', 2 ) - end - - test "should have a format representation" do - assert_equal '%s', @argument.to_format - end - - test "should be able to massage it's input value" do - assert_equal 'stringof( arg2 )', @argument.massage + test "should have a copy representation" do + assert_equal 'self->arg0_copy = arg0;', @argument.to_copy end end \ No newline at end of file test/instrumentation/argument_test.rb @@ -7,7 +7,7 @@ class DefinitionTest < Test::Unit::TestCase end test "should be able to read and parse it's definition" do - assert_kind_of Hash, @definition.read + assert_kind_of Array, @definition.read end test "should be able to infer it's group" do @@ -16,7 +16,7 @@ class DefinitionTest < Test::Unit::TestCase test "should be able to setup it's probes" do assert_equal 3, @definition.probes.size - assert_equal %w(rb_memerror rb_newobj ruby_xmalloc), @definition.probes.map{|p| p.name } + assert_equal ["rb_memerror", "ruby_xmalloc", "rb_newobj"], @definition.probes.map{|p| p.name } end end \ No newline at end of file test/instrumentation/definition_test.rb @@ -27,23 +27,23 @@ class ProbeCollectionTest < Test::Unit::TestCase assert_equal "%-24s %-24s %@20d", @probe_collection.report_format end - test "should be able to determine if all probes has a void return type" do - assert !@probe_collection.void? + test "should be able to determine if all probes has a return type" do + assert @probe_collection.return? end test "should have a format string representation" do - assert_equal "%11s %9s %12s", @probe_collection.format_string - assert_equal "%13s %11s %14s", @probe_collection.format_string( '/s' ) + assert_equal "%11s %12s %9s", @probe_collection.format_string + assert_equal "%13s %14s %11s", @probe_collection.format_string( '/s' ) end test "should have a string representation" do - assert_equal "rb_memerror rb_newobj ruby_xmalloc", @probe_collection.to_s - assert_equal "\"rb_memerror/s\" \"rb_newobj/s\" \"ruby_xmalloc/s\"", @probe_collection.to_s( '/s', ' ', "\"" ) + assert_equal "rb_memerror ruby_xmalloc rb_newobj", @probe_collection.to_s + assert_equal "\"rb_memerror/s\" \"ruby_xmalloc/s\" \"rb_newobj/s\"", @probe_collection.to_s( '/s', ' ', "\"" ) end test "should have a description representation" do - assert_equal "Memory Error New Object Created Memory allocation", @probe_collection.description - assert_equal "\"Memory Error/s\" \"New Object Created/s\" \"Memory allocation/s\"", @probe_collection.description( '/s', ' ', "\"" ) + assert_equal "rb_memerror ruby_xmalloc rb_newobj", @probe_collection.description + assert_equal "\"rb_memerror/s\" \"ruby_xmalloc/s\" \"rb_newobj/s\"", @probe_collection.description( '/s', ' ', "\"" ) end test "should have a result format representation" do test/instrumentation/probe_collection_test.rb @@ -6,6 +6,19 @@ class ProbeTest < Test::Unit::TestCase @probe = Mri::Instrumentation::Test.probe end + test "should have a hash representation" do + assert_equal( { "ruby_xrealloc" => { + "arguments" => + [{:probe=>"Probe"}, {"char *"=>"Address"}, {"int"=>"Allocation Size"}], + "storage" => nil, + "desc" => "ruby_xrealloc", + "return" => "VALUE" } }, @probe.to_hash ) + end + + test "should have a yaml representation" do + assert_equal "--- \nruby_xrealloc: \n arguments: \n - :probe: Probe\n - char *: Address\n - int: Allocation Size\n storage: \n desc: ruby_xrealloc\n return: VALUE\n", @probe.to_yaml + end + test "should be able to yield a format string representation of itself" do assert_equal '%13s', @probe.format_string assert_equal '%15s', @probe.format_string( '/s' ) @@ -19,8 +32,20 @@ class ProbeTest < Test::Unit::TestCase assert_equal 'ruby_xrealloc', @probe.to_s end - test "should be able to determine if it has no return" do - assert !@probe.void? + test "should be able to determine if it's static" do + assert !@probe.static? + end + + test "should be able to determine if it's external" do + assert !@probe.extern? + end + + test "should be able to determine if it has an entry" do + assert @probe.entry? + end + + test "should be able to determine if it has a return" do + assert @probe.return? end test "should be able to calculate it's length" do @@ -48,13 +73,13 @@ class ProbeTest < Test::Unit::TestCase end test "should be able to yield an arguments list" do - assert_equal 'this->type, this->arg0, this->arg1', @probe.arguments_list - assert_equal "this->type, this->arg0, this->arg1, \"\", \"\"", @probe.arguments_list( 5 ) - assert_equal "this->type, this->arg0, this->arg1, \"\"", @probe.arguments_list( 4 ) + assert_equal 'self->type, self->arg0, self->arg1', @probe.arguments_list + assert_equal "self->type, self->arg0, self->arg1, \"\", \"\"", @probe.arguments_list( 5 ) + assert_equal "self->type, self->arg0, self->arg1, \"\"", @probe.arguments_list( 4 ) end test "should be able to assign it's arguments from within a function def" do - assert_equal "this->type = probefunc;\nthis->arg0 = arg0;\nthis->arg1 = stringof( arg1 );", @probe.assign_arguments + assert_equal "self->type = self->type_copy;\nself->arg0 = self->arg0_copy;\nself->arg1 = self->arg1_copy;", @probe.assign_arguments end test "should be able to find it's probe argument" do test/instrumentation/probe_test.rb @@ -23,7 +23,7 @@ class BaseRunnerTest < Test::Unit::TestCase test "should be able to yield instrumentation probes from a given group signature" do @runner.probes :gc - assert_equal 43, @runner.probes.size + assert_equal 1, @runner.probes.size end test "should be able to yield instrumentation probes from a given group of probe signatures" do test/instrumentation/runner/base_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class BaseStrategyTest < Test::Unit::TestCase @@ -39,4 +40,5 @@ class BaseStrategyTest < Test::Unit::TestCase assert_match /test/, @strategy.report( 'test') end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/base_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class StrategyBuilderTest < Test::Unit::TestCase @@ -9,7 +10,8 @@ class StrategyBuilderTest < Test::Unit::TestCase end test "should be able to build a D stream" do - assert_equal " #!/usr/sbin/dtrace -ZFs \n #pragma D option quiet\n\n #pragma D option dynvarsize=64m\n\n \n \n dtrace:::BEGIN\n \n {\n printf(\"Tracing... Hit Ctrl-C to end.\\n\");\n \n }\n \n pid$target::rb_memerror:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\n \t @num[this->type, \"\"] = count();\n \t self->rb_memerror[self->depth] = timestamp; \n }\n pid$target::rb_memerror:return\n /self->rb_memerror[self->depth]/\n {\n this->elapsed_incl = timestamp - self->rb_memerror[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->rb_memerror[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\n \t @types_incl[this->type, \"\"] = sum(this->elapsed_incl);\n \t @types_excl[this->type, \"\"] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n pid$target::rb_newobj:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\n \t @num[this->type, \"\"] = count();\n \t self->rb_newobj[self->depth] = timestamp; \n }\n pid$target::rb_newobj:return\n /self->rb_newobj[self->depth]/\n {\n this->elapsed_incl = timestamp - self->rb_newobj[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->rb_newobj[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\n \t @types_incl[this->type, \"\"] = sum(this->elapsed_incl);\n \t @types_excl[this->type, \"\"] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n pid$target::ruby_xmalloc:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t this->arg0 = stringof( arg0 );\nthis->type = probefunc;\n \t @num[this->type, this->arg0] = count();\n \t self->ruby_xmalloc[self->depth] = timestamp; \n }\n pid$target::ruby_xmalloc:return\n /self->ruby_xmalloc[self->depth]/\n {\n this->elapsed_incl = timestamp - self->ruby_xmalloc[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->ruby_xmalloc[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t this->arg0 = stringof( arg0 );\nthis->type = probefunc;\n \t @types_incl[this->type, this->arg0] = sum(this->elapsed_incl);\n \t @types_excl[this->type, this->arg0] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n \n dtrace:::END\n \n {\n printf(\"\\nCount,\\n\");\n printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"COUNT\");\n \t printa(\" %-24s %-24s %@20d\\n\", @num);\n normalize(@types_excl, 1000);\n \t printf(\"\\nExclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_excl);\n\n \t normalize(@types_incl, 1000);\n \t printf(\"\\nInclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_incl); \n }\n ", @builder.to_s + assert_equal " #!/usr/sbin/dtrace -ZFs \n #pragma D option quiet\n\n #pragma D option dynvarsize=64m\n\n \n \n dtrace:::BEGIN\n \n {\n printf(\"Tracing... Hit Ctrl-C to end.\\n\");\n \n }\n \n pid$target::rb_memerror:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\n \t @num[self->type, \"\"] = count();\n \t self->rb_memerror[self->depth] = timestamp; \n }\n pid$target::rb_memerror:return\n /self->rb_memerror[self->depth]/\n {\n this->elapsed_incl = timestamp - self->rb_memerror[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->rb_memerror[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\n \t @types_incl[self->type, \"\"] = sum(this->elapsed_incl);\n \t @types_excl[self->type, \"\"] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n pid$target::rb_newobj:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\n \t @num[self->type, \"\"] = count();\n \t self->rb_newobj[self->depth] = timestamp; \n }\n pid$target::rb_newobj:return\n /self->rb_newobj[self->depth]/\n {\n this->elapsed_incl = timestamp - self->rb_newobj[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->rb_newobj[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\n \t @types_incl[self->type, \"\"] = sum(this->elapsed_incl);\n \t @types_excl[self->type, \"\"] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n pid$target::ruby_xmalloc:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t self->arg0 = stringof( arg0 );\nself->type = probefunc;\n \t @num[self->type, self->arg0] = count();\n \t self->ruby_xmalloc[self->depth] = timestamp; \n }\n pid$target::ruby_xmalloc:return\n /self->ruby_xmalloc[self->depth]/\n {\n this->elapsed_incl = timestamp - self->ruby_xmalloc[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->ruby_xmalloc[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t self->arg0 = stringof( arg0 );\nself->type = probefunc;\n \t @types_incl[self->type, self->arg0] = sum(this->elapsed_incl);\n \t @types_excl[self->type, self->arg0] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n \n dtrace:::END\n \n {\n printf(\"\\nCount,\\n\");\n printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"COUNT\");\n \t printa(\" %-24s %-24s %@20d\\n\", @num);\n normalize(@types_excl, 1000);\n \t printf(\"\\nExclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_excl);\n\n \t normalize(@types_incl, 1000);\n \t printf(\"\\nInclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_incl); \n }\n ", @builder.to_s end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/builder_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class CallsStrategyTest < Test::Unit::TestCase @@ -25,4 +26,5 @@ class CallsStrategyTest < Test::Unit::TestCase assert_equal " dtrace:::END\n \n {\n printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"CALLS\");\n \t printa(\" %-24s %-24s %@20d\\n\", @calls); \n }\n ", @strategy.report end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/calls_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class CalltimeStrategyTest < Test::Unit::TestCase @@ -18,15 +19,16 @@ class CalltimeStrategyTest < Test::Unit::TestCase end test "should be able to yield a function entry definition" do - assert_equal " pid$target::ruby_xrealloc:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\nthis->arg0 = arg0;\nthis->arg1 = stringof( arg1 );\n \t @num[this->type, this->arg0, this->arg1] = count();\n \t self->ruby_xrealloc[self->depth] = timestamp; \n }\n ", @strategy.entry + assert_equal " pid$target::ruby_xrealloc:entry\n \n {\n self->depth++;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\nself->arg0 = arg0;\nself->arg1 = stringof( arg1 );\n \t @num[self->type, self->arg0, self->arg1] = count();\n \t self->ruby_xrealloc[self->depth] = timestamp; \n }\n ", @strategy.entry end test "should be able to yield a function return definition" do - assert_equal " pid$target::ruby_xrealloc:return\n /self->ruby_xrealloc[self->depth]/\n {\n this->elapsed_incl = timestamp - self->ruby_xrealloc[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->ruby_xrealloc[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t this->type = probefunc;\nthis->arg0 = arg0;\nthis->arg1 = stringof( arg1 );\n \t @types_incl[this->type, this->arg0, this->arg1] = sum(this->elapsed_incl);\n \t @types_excl[this->type, this->arg0, this->arg1] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n ", @strategy.return + assert_equal " pid$target::ruby_xrealloc:return\n /self->ruby_xrealloc[self->depth]/\n {\n this->elapsed_incl = timestamp - self->ruby_xrealloc[self->depth];\n this->elapsed_excl = this->elapsed_incl - self->exclude[self->depth];\n \t self->ruby_xrealloc[self->depth] = 0;\n \t self->exclude[self->depth] = 0;\n \t self->type = probefunc;\nself->arg0 = arg0;\nself->arg1 = stringof( arg1 );\n \t @types_incl[self->type, self->arg0, self->arg1] = sum(this->elapsed_incl);\n \t @types_excl[self->type, self->arg0, self->arg1] = sum(this->elapsed_excl);\n\n \t self->depth--;\n \t self->exclude[self->depth] += this->elapsed_incl; \n }\n ", @strategy.return end test "should be able to yield a reporting function" do assert_equal " dtrace:::END\n \n {\n printf(\"\\nCount,\\n\");\n printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"COUNT\");\n \t printa(\" %-24s %-24s %@20d\\n\", @num);\n normalize(@types_excl, 1000);\n \t printf(\"\\nExclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_excl);\n\n \t normalize(@types_incl, 1000);\n \t printf(\"\\nInclusive function elapsed times (us),\\n\");\n \t printf(\" %-24s %-24s %20s\\n\", \"Probe\", \"arg0\", \"TOTAL\");\n \t printa(\" %-24s %-24s %@20d\\n\", @types_incl); \n }\n ", @strategy.report end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/calltime_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class FlowStrategyTest < Test::Unit::TestCase @@ -25,4 +26,5 @@ class FlowStrategyTest < Test::Unit::TestCase assert_equal " pid$target::ruby_xrealloc:return\n \n {\n printf(\"%3d %-16d %-22s %*s<-\\n\", cpu, timestamp / 1000, \n probefunc, self->depth * 2, \"\" );\n \n }\n ", @strategy.return end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/flow_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class IntervalStrategyTest < Test::Unit::TestCase @@ -25,4 +26,5 @@ class IntervalStrategyTest < Test::Unit::TestCase assert_equal " profile:::tick-1sec\n {\n \tprintf(\"%20Y %6d %6d %6d\\n\", walltimestamp, rb_memerror, rb_newobj, ruby_xmalloc);\n\n \trb_memerror = 0;\nrb_newobj = 0;\nruby_xmalloc = 0;\n }\n ", @strategy.report end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/interval_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class PeekTest < Test::Unit::TestCase @@ -18,7 +19,7 @@ class PeekTest < Test::Unit::TestCase end test "should be able to yield a guarded function entry definition" do - assert_equal " pid$target::ruby_xrealloc:entry\n /guard++ == 0/\n {\n self->peek = 1;\n this->type = probefunc;\nthis->arg0 = arg0;\nthis->arg1 = stringof( arg1 );\n printf( \"%13s\", this->type, this->arg0, this->arg1 ); \n }\n ", @strategy.guarded_entry + assert_equal " pid$target::ruby_xrealloc:entry\n /guard++ == 0/\n {\n self->peek = 1;\n self->type = probefunc;\nself->arg0 = arg0;\nself->arg1 = stringof( arg1 );\n printf( \"%13s\", self->type, self->arg0, self->arg1 ); \n }\n ", @strategy.guarded_entry end test "should be able to yield a function return definition" do @@ -29,4 +30,5 @@ class PeekTest < Test::Unit::TestCase assert_equal " pid$target:::\n /self->peek/\n {\n \n }\n ", @strategy.peek end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/peek_test.rb @@ -1,3 +1,4 @@ +=begin require File.join( File.dirname( __FILE__ ), '..', '..', 'helper' ) class SpeculateTest < Test::Unit::TestCase @@ -29,4 +30,5 @@ class SpeculateTest < Test::Unit::TestCase assert_equal " pid$target::ruby_xrealloc:return\n /self->spec && errno != 0/\n {\n discard(self->spec); \n self->spec = 0; \n }\n ", @strategy.return_failure end -end \ No newline at end of file +end +=end \ No newline at end of file test/instrumentation/strategy/speculate_test.rb probes/18/block.yml probes/18/cache.yml probes/18/gc.yml probes/18/parse.yml probes/18/require.yml 8b3e59ec2ac4e11b4c0468b31cc021824e0bc1d5 Lourens Naude lourens@methodmissing.com http://github.com/methodmissing/mri_instrumentation/commit/e8138b2041526a53dd2d7116552fc138c800a99b e8138b2041526a53dd2d7116552fc138c800a99b 2009-05-03T13:21:15-07:00 2009-05-03T13:21:15-07:00 Major overhaul: MRI C AST -> YAML function defs -> probes 3b7cce337862c88bcf1f4f0c2988474f480eb39c Lourens Naude lourens@methodmissing.com