October 2009 - macruby-changes - lists.macosforge.org

[2775] MacRuby/trunk/object.c
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2775 http://trac.macosforge.org/projects/ruby/changeset/2775 Author: lsansonetti(a)apple.com Date: 2009-10-09 16:39:35 -0700 (Fri, 09 Oct 2009) Log Message: ----------- never return the return value of #initialize (fixes #370) Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2009-10-09 20:39:16 UTC (rev 2774) +++ MacRuby/trunk/object.c 2009-10-09 23:39:35 UTC (rev 2775) @@ -1868,13 +1868,11 @@ static inline VALUE rb_class_new_instance0(int argc, VALUE *argv, VALUE klass) { - VALUE obj, init_obj, p; - if (klass == rb_cNSMutableArray) { klass = rb_cRubyArray; } - obj = rb_obj_alloc0(klass); + VALUE obj = rb_obj_alloc0(klass); /* Because we cannot override +[NSObject initialize] */ if (klass == rb_cClass) { @@ -1885,24 +1883,14 @@ rb_vm_block_t *block = rb_vm_current_block(); if (argc == 0) { - init_obj = rb_vm_call_with_cache2(initializeCache, block, obj, - CLASS_OF(obj), selInitialize, argc, argv); + rb_vm_call_with_cache2(initializeCache, block, obj, CLASS_OF(obj), + selInitialize, argc, argv); } else { - init_obj = rb_vm_call_with_cache2(initialize2Cache, block, obj, - CLASS_OF(obj), selInitialize2, argc, argv); + rb_vm_call_with_cache2(initialize2Cache, block, obj, CLASS_OF(obj), + selInitialize2, argc, argv); } - if (init_obj != Qnil) { - p = CLASS_OF(init_obj); - while (p != 0) { - if (p == klass) { - return init_obj; - } - p = RCLASS_SUPER(p); - } - } - return obj; }

1 0

[2774] MacRuby/trunk/spec
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2774 http://trac.macosforge.org/projects/ruby/changeset/2774 Author: mattaimonetti(a)gmail.com Date: 2009-10-09 13:39:16 -0700 (Fri, 09 Oct 2009) Log Message: ----------- switched the library specs to use a black list instead of a white list. Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/library/conditionvariable/broadcast_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/deflate/params_tags.txt MacRuby/trunk/spec/macruby.mspec Added Paths: ----------- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/dump_stream_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/each_document_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/parse_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagged_classes_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagurize_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/close_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/comment_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/orig_name_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/eof_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/pos_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/read_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/rewind_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipwriter/mtime_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/inflate/ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/inflate/append_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/zstream/ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/zstream/flush_next_out_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/conditionvariable/broadcast_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/conditionvariable/broadcast_tags.txt 2009-10-09 19:24:13 UTC (rev 2773) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/conditionvariable/broadcast_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -1,2 +1,3 @@ fails:ConditionVariable#broadcast should return self if nothing to broadcast to fails:ConditionVariable#broadcast should return self if something is waiting for a broadcast +fails:ConditionVariable#broadcast releases all threads waiting in line for this resource Added: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/dump_stream_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/dump_stream_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/dump_stream_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:YAML.dump_stream returns a YAML stream containing the objects passed Added: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/each_document_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/each_document_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/each_document_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1,2 @@ +fails:YAML#each_document calls the block on each succesive document +fails:YAML#each_document works on files Added: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/parse_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/parse_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/parse_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1,2 @@ +fails:YAML#parse with an empty string returns false +fails:YAML#parse returns the value from the object Added: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagged_classes_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagged_classes_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagged_classes_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:YAML.tagged_classes returns a complete dictionary of taguris paired with classes Added: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagurize_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagurize_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/tagurize_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:YAML.tagurize converts a type_id to a taguri Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt 2009-10-09 19:24:13 UTC (rev 2773) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/yaml/to_yaml_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -1 +1,7 @@ fails:Object#to_yaml returns the YAML representation of a Struct object +fails:Object#to_yaml returns the YAML representation of an Array object +fails:Object#to_yaml returns the YAML representation of a Date object +fails:Object#to_yaml returns the YAML represenation of a RegExp object +fails:Object#to_yaml returns the YAML representation of a Time object +fails:Object#to_yaml returns the YAML representation of a Error object +fails:Object#to_yaml returns the YAML representation for Range objects Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/deflate/params_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/deflate/params_tags.txt 2009-10-09 19:24:13 UTC (rev 2773) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/deflate/params_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -1 +1 @@ -fails:Zlib::Deflate#params changes the deflate parameters +critical:Zlib::Deflate#params changes the deflate parameters \ No newline at end of file Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/close_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/close_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/close_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +critical:Zlib::GzipFile#close finishes the stream and closes the io Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/comment_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/comment_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/comment_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +critical:Zlib::GzipFile#comment returns the name \ No newline at end of file Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/orig_name_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/orig_name_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipfile/orig_name_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +critical:Zlib::GzipFile#orig_name returns the name \ No newline at end of file Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/eof_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/eof_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/eof_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:GzipReader#eof? returns true when at EOF Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/pos_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/pos_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/pos_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:GzipReader#pos returns the position Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/read_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/read_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/read_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1,2 @@ +fails:GzipReader#read reads the contents of a gzip file +fails:GzipReader#read reads the contents up to a certain size Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/rewind_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/rewind_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipreader/rewind_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1,2 @@ +fails:GzipReader#rewind resets the position of the file pointer +fails:GzipReader#rewind invokes seek method on the associated IO object Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipwriter/mtime_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipwriter/mtime_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/gzipwriter/mtime_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +fails:Zlib::GzipWriter#mtime= sets mtime using Time Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/inflate/append_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/inflate/append_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/inflate/append_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +critical:Zlib::Inflate#<< appends data to the input stream \ No newline at end of file Added: MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/zstream/flush_next_out_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/zstream/flush_next_out_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/zlib/zstream/flush_next_out_tags.txt 2009-10-09 20:39:16 UTC (rev 2774) @@ -0,0 +1 @@ +critical:Zlib::ZStream#flush_next_out flushes the stream and flushes the output buffer \ No newline at end of file Modified: MacRuby/trunk/spec/macruby.mspec =================================================================== --- MacRuby/trunk/spec/macruby.mspec 2009-10-09 19:24:13 UTC (rev 2773) +++ MacRuby/trunk/spec/macruby.mspec 2009-10-09 20:39:16 UTC (rev 2774) @@ -19,79 +19,26 @@ # Library specs set :library, [ - 'library/abbrev', - 'library/base64', - 'library/cgi', - 'library/complex', - 'library/conditionalvariable', - 'library/csv', - 'library/date', - 'library/digest', - 'library/drb', - 'library/enumerator', - 'library/etc', - 'library/ftools', - 'library/generator', - 'library/getoptlong', - 'library/ipaddr', - 'library/logger', - 'library/logger/application', - 'library/logger/device', - 'library/logger/logger', - 'library/mathn', - 'library/matrix', - 'library/mutex', - 'library/net', - 'library/net/telnet', - 'library/observer', - 'library/openstruct', - 'library/parsedate', - 'library/pathname', - 'library/ping', - 'library/rational', - 'library/queue', - 'library/readline', - 'library/resolv', - 'library/rexml', - 'library/scanf', - 'library/securerandom', - 'library/shellwords', - 'library/singleton', - 'library/socket', - 'library/stringio', - 'library/stringscanner', - 'library/tempfile', - 'library/time', - 'library/timeout', - 'library/tmpdir', - 'library/uri', - 'library/yaml/dump_spec.rb', - 'library/yaml/load_documents_spec.rb', - 'library/yaml/load_file.spec', - 'library/yaml/load_spec.rb', - 'library/yaml/tag_class_spec.rb', + 'library', # Currently not working on MacRuby + '^library/bigdecimal', '^library/erb', '^library/iconv', '^library/generator', '^library/openssl', '^library/net/http', # due to '/fixtures/http_server' loaded in net/http/http/active_spec.rb (webrick) '^library/net/ftp', # exists the specs when running using rake spec:library and reaching net/ftp/chdir_spec.rb - '^library/prime', # hangs probably because of timeout '^library/set', # sortedset is segfaulting - '^library/syslog', - - -=begin + '^library/syslog', # disabled the zlib specs for now because of a random GC crash # that seems to occur in gzipfile/closed_spec.rb - 'library/zlib/adler32_spec.rb', - 'library/zlib/crc32_spec.rb', - 'library/zlib/crc_table_spec.rb', - 'library/zlib/deflate' -=end + '^library/zlib/adler32_spec.rb', + '^library/zlib/crc32_spec.rb', + '^library/zlib/crc_table_spec.rb', + '^library/zlib/deflate', + '^library/zlib/inflate' ] # Prepend the paths with the proper prefix

1 0

[2773] MacRuby/trunk/TODO
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2773 http://trac.macosforge.org/projects/ruby/changeset/2773 Author: lsansonetti(a)apple.com Date: 2009-10-09 12:24:13 -0700 (Fri, 09 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-09 19:22:24 UTC (rev 2772) +++ MacRuby/trunk/TODO 2009-10-09 19:24:13 UTC (rev 2773) @@ -8,6 +8,7 @@ [X] Array subclass for immediates [ ] Hash subclass for immediates [ ] try/catch should use a C++ exception +[ ] implement 'protected' visibility [ ] remaining Cocoa bugs [X] ObjC exceptions should be catchable in Ruby [X] honor BridgeSupport sel_of_type attribute

1 0

[2772] MacRuby/trunk/TODO
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2772 http://trac.macosforge.org/projects/ruby/changeset/2772 Author: lsansonetti(a)apple.com Date: 2009-10-09 12:22:24 -0700 (Fri, 09 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-09 03:17:54 UTC (rev 2771) +++ MacRuby/trunk/TODO 2009-10-09 19:22:24 UTC (rev 2772) @@ -15,6 +15,7 @@ [X] add support for variadic functions / methods [ ] support for bigdecimal [ ] support for json + wrap http://github.com/lloyd/yajl ? [/] support for yaml [ ] support for openssl [/] support for zlib

1 0

[2771] MacRuby/trunk/TODO
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2771 http://trac.macosforge.org/projects/ruby/changeset/2771 Author: lsansonetti(a)apple.com Date: 2009-10-08 20:17:54 -0700 (Thu, 08 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-09 03:17:34 UTC (rev 2770) +++ MacRuby/trunk/TODO 2009-10-09 03:17:54 UTC (rev 2771) @@ -21,7 +21,7 @@ [/] support for Mocha (grep -R 'Mocha TODO' test_vm) [ ] merge stdlib from 1.9.2 trunk [/] most language/core/library specs should run (modulo a very few exceptions) -[ ] add the DTrace custom probes +[X] add the DTrace custom probes [X] port all rb_define_method() calls to rb_objc_define_method() [/] port all rb_funcall() calls to rb_vm_call() [/] port all rb_num_coerce_bin() calls to rb_objc_num_coerce_bin()

1 0

[2770] MacRuby/trunk
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2770 http://trac.macosforge.org/projects/ruby/changeset/2770 Author: lsansonetti(a)apple.com Date: 2009-10-08 20:17:34 -0700 (Thu, 08 Oct 2009) Log Message: ----------- added raise dtrace probe Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-09 01:57:40 UTC (rev 2769) +++ MacRuby/trunk/dispatcher.cpp 2009-10-09 03:17:34 UTC (rev 2770) @@ -500,20 +500,6 @@ return true; } -static force_inline void -symbolize(int delta, char *path, size_t pathlen, unsigned long *line) -{ - void *callstack[10]; - const int callstack_n = backtrace(callstack, 10); - - if (callstack_n < delta - || !GET_CORE()->symbolize_call_address(callstack[delta], NULL, - path, pathlen, line, NULL, 0)) { - strncpy(path, "core", pathlen); - *line = 0; - } -} - static force_inline VALUE __rb_vm_dispatch(RoxorVM *vm, struct mcache *cache, VALUE self, Class klass, SEL sel, rb_vm_block_t *block, unsigned char opt, int argc, @@ -710,7 +696,8 @@ char *method_name = (char *)sel_getName(sel); char file[PATH_MAX]; unsigned long line = 0; - symbolize(1, file, sizeof file, &line); + GET_CORE()->symbolize_backtrace_entry(1, NULL, file, sizeof file, + &line, NULL, 0); MACRUBY_METHOD_ENTRY(class_name, method_name, file, line); } @@ -723,7 +710,8 @@ char *method_name = (char *)sel_getName(sel); char file[PATH_MAX]; unsigned long line = 0; - symbolize(1, file, sizeof file, &line); + GET_CORE()->symbolize_backtrace_entry(1, NULL, file, sizeof file, + &line, NULL, 0); MACRUBY_METHOD_RETURN(class_name, method_name, file, line); } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-09 01:57:40 UTC (rev 2769) +++ MacRuby/trunk/vm.cpp 2009-10-09 03:17:34 UTC (rev 2770) @@ -37,6 +37,7 @@ #include "vm.h" #include "compiler.h" #include "objc.h" +#include "dtrace.h" #include <objc/objc-exception.h> @@ -495,6 +496,27 @@ return true; } +void +RoxorCore::symbolize_backtrace_entry(int index, void **startp, char *path, + size_t path_len, unsigned long *ln, char *name, size_t name_len) +{ + void *callstack[10]; + const int callstack_n = backtrace(callstack, 10); + + index++; // count us! + + if (callstack_n < index + || !GET_CORE()->symbolize_call_address(callstack[index], startp, + path, path_len, ln, name, name_len)) { + if (path != NULL) { + strncpy(path, "core", path_len); + } + if (ln != NULL) { + *ln = 0; + } + } +} + struct ccache * RoxorCore::constant_cache_get(ID path) { @@ -2786,9 +2808,19 @@ static inline void __vm_raise(void) { + VALUE rb_exc = GET_VM()->current_exception(); + // DTrace probe: raise + if (MACRUBY_RAISE_ENABLED()) { + char *classname = (char *)rb_class2name(CLASS_OF(rb_exc)); + char file[PATH_MAX]; + unsigned long line = 0; + GET_CORE()->symbolize_backtrace_entry(2, NULL, file, sizeof file, + &line, NULL, 0); + MACRUBY_RAISE(classname, file, line); + } #if __LP64__ // In 64-bit, an Objective-C exception is a C++ exception. - id exc = rb_rb2oc_exception(GET_VM()->current_exception()); + id exc = rb_rb2oc_exception(rb_exc); objc_exception_throw(exc); #else void *exc = __cxa_allocate_exception(0); Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-09 01:57:40 UTC (rev 2769) +++ MacRuby/trunk/vm.h 2009-10-09 03:17:34 UTC (rev 2770) @@ -675,6 +675,10 @@ char *path, size_t path_len, unsigned long *ln, char *name, size_t name_len); + void symbolize_backtrace_entry(int index, void **startp, + char *path, size_t path_len, unsigned long *ln, + char *name, size_t name_len); + struct mcache *method_cache_get(SEL sel, bool super); rb_vm_method_node_t *method_node_get(IMP imp, bool create=false); rb_vm_method_node_t *method_node_get(Method m, bool create=false);

1 0

[2769] MacRuby/trunk/sample-macruby/DTrace/methods_count.d
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2769 http://trac.macosforge.org/projects/ruby/changeset/2769 Author: lsansonetti(a)apple.com Date: 2009-10-08 18:57:40 -0700 (Thu, 08 Oct 2009) Log Message: ----------- comment live output Modified Paths: -------------- MacRuby/trunk/sample-macruby/DTrace/methods_count.d Modified: MacRuby/trunk/sample-macruby/DTrace/methods_count.d =================================================================== --- MacRuby/trunk/sample-macruby/DTrace/methods_count.d 2009-10-09 01:57:20 UTC (rev 2768) +++ MacRuby/trunk/sample-macruby/DTrace/methods_count.d 2009-10-09 01:57:40 UTC (rev 2769) @@ -9,8 +9,9 @@ macruby$target:::method-entry { - printf("%30s:%-5d %s#%s\n", copyinstr(arg2), arg3, +/* printf("%30s:%-5d %s#%s\n", copyinstr(arg2), arg3, copyinstr(arg0), copyinstr(arg1)); +*/ @methods_count[copyinstr(arg0), copyinstr(arg1)] = count(); }

1 0

[2768] MacRuby/trunk/sample-macruby/DTrace/insns_count.d
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2768 http://trac.macosforge.org/projects/ruby/changeset/2768 Author: lsansonetti(a)apple.com Date: 2009-10-08 18:57:20 -0700 (Thu, 08 Oct 2009) Log Message: ----------- this script will not run anymore Removed Paths: ------------- MacRuby/trunk/sample-macruby/DTrace/insns_count.d Deleted: MacRuby/trunk/sample-macruby/DTrace/insns_count.d =================================================================== --- MacRuby/trunk/sample-macruby/DTrace/insns_count.d 2009-10-09 01:56:53 UTC (rev 2767) +++ MacRuby/trunk/sample-macruby/DTrace/insns_count.d 2009-10-09 01:57:20 UTC (rev 2768) @@ -1,21 +0,0 @@ -#!/usr/sbin/dtrace -s - -#pragma D option quiet - -BEGIN -{ - printf("Target pid: %d\n\n", $target); -} - -macruby$target:::insn-entry -{ - @[copyinstr(arg0)] = count(); -} - -END -{ - printf("\n"); - printf("%30s %-30s\n", "INSN", "COUNT"); - printf("--------------------------------------------------------------------------------\n"); - printa("%30s %-30@d\n", @); -}

1 0

[2767] MacRuby/trunk/dtrace.d
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2767 http://trac.macosforge.org/projects/ruby/changeset/2767 Author: lsansonetti(a)apple.com Date: 2009-10-08 18:56:53 -0700 (Thu, 08 Oct 2009) Log Message: ----------- removed the insn__entry and insn__return probes now that yarv is gone Modified Paths: -------------- MacRuby/trunk/dtrace.d Modified: MacRuby/trunk/dtrace.d =================================================================== --- MacRuby/trunk/dtrace.d 2009-10-09 01:56:36 UTC (rev 2766) +++ MacRuby/trunk/dtrace.d 2009-10-09 01:56:53 UTC (rev 2767) @@ -1,6 +1,4 @@ provider macruby { - probe insn__entry(char *insnname, char *sourcefile, int sourceline); - probe insn__return(char *insnname, char *sourcefile, int sourceline); probe method__entry(char *classname, char *methodname, char *sourcefile, int sourceline); probe method__return(char *classname, char *methodname, char *sourcefile, int sourceline); probe raise(char *classname, char *sourcefile, int sourceline);

1 0

[2766] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 2766 http://trac.macosforge.org/projects/ruby/changeset/2766 Author: lsansonetti(a)apple.com Date: 2009-10-08 18:56:36 -0700 (Thu, 08 Oct 2009) Log Message: ----------- added method__entry and method__return dtrace probes Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-08 17:02:55 UTC (rev 2765) +++ MacRuby/trunk/dispatcher.cpp 2009-10-09 01:56:36 UTC (rev 2766) @@ -13,6 +13,7 @@ #include "vm.h" #include "compiler.h" #include "objc.h" +#include "dtrace.h" #include <execinfo.h> #include <dlfcn.h> @@ -499,6 +500,20 @@ return true; } +static force_inline void +symbolize(int delta, char *path, size_t pathlen, unsigned long *line) +{ + void *callstack[10]; + const int callstack_n = backtrace(callstack, 10); + + if (callstack_n < delta + || !GET_CORE()->symbolize_call_address(callstack[delta], NULL, + path, pathlen, line, NULL, 0)) { + strncpy(path, "core", pathlen); + *line = 0; + } +} + static force_inline VALUE __rb_vm_dispatch(RoxorVM *vm, struct mcache *cache, VALUE self, Class klass, SEL sel, rb_vm_block_t *block, unsigned char opt, int argc, @@ -689,7 +704,30 @@ } } finalizer(block_already_current, current_klass, vm); - return __rb_vm_ruby_dispatch(self, sel, rcache.node, opt, argc, argv); + // DTrace probe: method__entry + if (MACRUBY_METHOD_ENTRY_ENABLED()) { + char *class_name = (char *)rb_class2name((VALUE)klass); + char *method_name = (char *)sel_getName(sel); + char file[PATH_MAX]; + unsigned long line = 0; + symbolize(1, file, sizeof file, &line); + MACRUBY_METHOD_ENTRY(class_name, method_name, file, line); + } + + VALUE v = __rb_vm_ruby_dispatch(self, sel, rcache.node, opt, + argc, argv); + + // DTrace probe: method__return + if (MACRUBY_METHOD_RETURN_ENABLED()) { + char *class_name = (char *)rb_class2name((VALUE)klass); + char *method_name = (char *)sel_getName(sel); + char file[PATH_MAX]; + unsigned long line = 0; + symbolize(1, file, sizeof file, &line); + MACRUBY_METHOD_RETURN(class_name, method_name, file, line); + } + + return v; } else if (cache->flag == MCACHE_OCALL) { if (ocache.klass != klass) {

1 0