@@ -13,4 +13,22 @@ - find_dirsep - remove_backslashes - glob_make_pattern -- rb_glob2 \ No newline at end of file +- rb_glob2 +- err_print +- init_funcname_len +- objcdummyfunction +- init_syntax_once +- print_mbc +- print_partial_compiled_pattern +- print_compiled_pattern +- calculate_must_string +- read_backslash +- insert_jump_n +- insert_op +- slow_match +- slow_search +- bm_init_skip +- bm_search +- init_regs +- re_match_exec +- memcmp_translate \ No newline at end of file config/18/ignores.yml @@ -19,44 +19,52 @@ module Mri # and integers. # - TYPES = { 'VALUE' => ['%s', '(string)%d'], - 'VALUE *' => ['%s', '(string)%d'], - 'const VALUE *' => ['%s', '(string)%d'], - 'long int' => ['%s', '(string)%d'], + TYPES = { 'VALUE' => ['copyinstr(%s)', '%s'], + 'VALUE *' => ['(string)%s', '%s'], + 'const VALUE *' => ['(string)%s', '%s'], + 'long int' => ['(string)%s', '%s'], 'void' => ['%s', '%s'], - 'int' => ['%s', '(string)%d'], - 'struct inspect_arg *' => ['%s', '%s'], - 'VALUE (*)()' => ['%s', '%s'], - 'struct ary_sort_data *' => ['%s', '%s'], - 'VALUE (*)(VALUE, long int)' => ['%s', '%s'], + 'struct re_pattern_buffer *' => ['(string)%s', '%s'], + 'struct re_registers *' => ['(string)%s', '%s'], + 'int' => ['(string)%s', '%s'], + 'unsigned char *' => ['copyinstr(%s)', '%s'], + 'struct inspect_arg *' => ['copyinstr(%s)', '%s'], + 'VALUE (*)()' => ['copyinstr(%s)', '%s'], + 'struct ary_sort_data *' => ['copyinstr(%s)', '%s'], + 'VALUE (*)(VALUE, long int)' => ['(string)%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', '(string)%d'], - 'const char *' => ['%s', 'copyinstr(%s)'], - 'unsigned long int' => ['%s', '(string)%d'], - 'char *' => ['%s', '%s'], - 'const unsigned char *' => ['%s', '%s'], - 'unsigned long long int' => ['%s', '(string)%d'], - 'long long int' => ['%s', '(string)%d'], - 'double' => ['%s', '(string)%d'], - 'double *' => ['%s', '(string)%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)'], + 'const double' => ['(string)%s', '%s'], + 'char' => ['copyinstr(%s)', '%s'], + 'unsigned int' => ['(string)%s', '%s'], + 'long int *' => ['(string)%s', '%s'], + 'struct st_hash_type *' => ['(string)%s', '%s'], + 'st_table' => ['(string)%s', '%s'], + 'st_table *' => ['(string)%s', '%s'], + 'st_data_t' => ['(string)%s', '%s'], + 'st_data_t *' => ['(string)%s', '%s'], + 'int (*)()' => ['(string)%s', '%s'], + 'const char *' => ['copyinstr(%s)', '%s'], + 'char **' => ['copyinstr(%s)', '%s'], + 'unsigned long int' => ['(string)%s', '%s'], + 'char *' => ['copyinstr(%s)', '%s'], + 'const unsigned char *' => ['copyinstr(%s)', '%s'], + 'unsigned long long int' => ['(string)%s', '%s'], + 'long long int' => ['(string)%s', '%s'], + 'double' => ['(string)%s', '%s'], + 'double *' => ['(string)%s', '%s'], + 'const char **' => ['copyinstr(%s)', '%s'], + 'struct dir_data *' => ['(string)%s', '%s'], + 'struct chdir_data *' => ['(string)%s', '%s'], + 'struct stat *' => ['(string)%s', '%s'], + 'DIR *' => ['(string)%s', '%s'], + 'struct glob_pattern *' => ['(string)%s', '%s'], + 'enum answer' => ['(string)%s', '%s'], + 'ruby_glob_func *' => ['(string)%s', '%s'], + 'void (*)(const char *, VALUE)' => ['(string)%s', '%s'], + 'gid_t' => ['(string)%s', '%s'], + 'OpenFile *' => ['(string)%s', '%s'], + 'FILE *' => ['(string)%s', '%s'], + 'ID' => ['(string)%s', '%s'], 'struct foreach_arg *' => ['%s', '%s'], 'struct kwtable *' => ['%s', '%s'], :probe => ['%s', '%s'] @@ -90,7 +98,11 @@ module Mri # Standardized on everything being a string, for the time being. # def massage - @massage ||= lookup.first % to_var( '_copy' ) + begin + @massage ||= lookup.first % to_var( '_copy' ) + rescue => exception + raise( exception, self.inspect ) + end end # String representation as description lib/mri/instrumentation/argument.rb @@ -82,7 +82,7 @@ module Mri Tempfile.open( 'mri_instrumentation' ) do |file| file << d_stream() file.flush - #%x[mate #{file.path}] + %x[mate #{file.path}] cmd = "sudo dtrace -s #{file.path} #{yield}" @result = replace? ? exec( cmd ) : %x[#{cmd}] end lib/mri/instrumentation/runner/base.rb @@ -1,11 +1,4 @@ --- -- init_funcname_len: - arguments: - - char **: buf - - const char *: file - storage: static - desc: init_funcname_len - return: int - dln_strerror: arguments: [] probes/18/dln.yml @@ -15,13 +15,6 @@ storage: static desc: err_snprintf return: void -- err_print: - arguments: - - const char *: fmt - - va_list: args - storage: static - desc: err_print - return: void - rb_compile_error: arguments: - const char *: fmt probes/18/error.yml @@ -1,10 +1,4 @@ --- -- objcdummyfunction: - arguments: [] - - storage: static - desc: objcdummyfunction - return: void - main: arguments: - int: argc probes/18/main.yml @@ -1,10 +1,4 @@ --- -- init_syntax_once: - arguments: [] - - storage: static - desc: init_syntax_once - return: void - ruby_re_set_casetable: arguments: - const char *: table @@ -23,12 +17,6 @@ storage: static desc: utf8_firstbyte return: unsigned int -- print_mbc: - arguments: - - unsigned int: c - storage: static - desc: print_mbc - return: void - set_list_bits: arguments: - unsigned long int: c1 @@ -58,32 +46,6 @@ storage: static desc: is_in_list return: int -- print_partial_compiled_pattern: - arguments: - - unsigned char *: start - - unsigned char *: end - storage: static - desc: print_partial_compiled_pattern - return: void -- print_compiled_pattern: - arguments: - - struct re_pattern_buffer *: bufp - storage: static - desc: print_compiled_pattern - return: void -- calculate_must_string: - arguments: - - char *: start - - char *: end - storage: static - desc: calculate_must_string - return: char * -- read_backslash: - arguments: - - int: c - storage: static - desc: read_backslash - return: unsigned int - read_special: arguments: - const char *: p @@ -132,24 +94,6 @@ storage: static desc: store_jump_n return: void -- insert_jump_n: - arguments: - - int: op - - char *: from - - char *: to - - char *: current_end - - unsigned int: n - storage: static - desc: insert_jump_n - return: void -- insert_op: - arguments: - - int: op - - char *: there - - char *: current_end - storage: static - desc: insert_op - return: void - insert_op_2: arguments: - int: op @@ -160,46 +104,6 @@ storage: static desc: insert_op_2 return: void -- slow_match: - arguments: - - const unsigned char *: little - - const unsigned char *: lend - - const unsigned char *: big - - const unsigned char *: bend - - const unsigned char *: translate - storage: static - desc: slow_match - return: int -- slow_search: - arguments: - - const unsigned char *: little - - int: llen - - const unsigned char *: big - - int: blen - - const char *: translate - storage: static - desc: slow_search - return: int -- bm_init_skip: - arguments: - - int *: skip - - unsigned char *: pat - - int: m - - const unsigned char *: translate - storage: static - desc: bm_init_skip - return: void -- bm_search: - arguments: - - const unsigned char *: little - - int: llen - - const unsigned char *: big - - int: blen - - int *: skip - - const unsigned char *: translate - storage: static - desc: bm_search - return: int - re_compile_fastmap0: arguments: - struct re_pattern_buffer *: bufp @@ -242,13 +146,6 @@ storage: "" desc: ruby_re_search return: int -- init_regs: - arguments: - - struct re_registers *: regs - - unsigned int: num_regs - storage: static - desc: init_regs - return: void - ruby_re_match: arguments: - struct re_pattern_buffer *: bufp @@ -259,25 +156,6 @@ storage: "" desc: ruby_re_match return: int -- re_match_exec: - arguments: - - struct re_pattern_buffer *: bufp - - const char *: string_arg - - int: size - - int: pos - - int: beg - - struct re_registers *: regs - storage: static - desc: re_match_exec - return: int -- memcmp_translate: - arguments: - - unsigned char *: s1 - - unsigned char *: s2 - - int: len - storage: static - desc: memcmp_translate - return: int - ruby_re_copy_registers: arguments: - struct re_registers *: regs1 probes/18/regex.yml probes/18/class.yml probes/18/enum.yml probes/18/eval.yml probes/18/gc.yml probes/18/ruby.yml probes/18/variable.yml b42479d41d5ccfae692da52b3ee8116bb7404ac3 Lourens Naude lourens@methodmissing.com http://github.com/methodmissing/mri_instrumentation/commit/3c4f8175d2678f173559cea1b5a2d8b49dd746ef 3c4f8175d2678f173559cea1b5a2d8b49dd746ef 2009-05-07T04:27:58-07:00 2009-05-07T04:27:58-07:00 Probe def cleanups d39f2fa8db3a184ea00a1fd5bf41fa2e0754ef0e Lourens Naude lourens@methodmissing.com