January 2010 - macruby-changes - lists.macosforge.org

[3213] MacRuby/branches/hotcocoa/
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3213 http://trac.macosforge.org/projects/ruby/changeset/3213 Author: lsansonetti(a)apple.com Date: 2010-01-08 13:28:02 -0800 (Fri, 08 Jan 2010) Log Message: ----------- branching trunk when hotcocoa is still there Added Paths: ----------- MacRuby/branches/hotcocoa/

1 0

[3212] MacRuby/trunk
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3212 http://trac.macosforge.org/projects/ruby/changeset/3212 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-08 12:34:12 -0800 (Fri, 08 Jan 2010) Log Message: ----------- Un-reverted rdoc parser changes, added error checking, fixed doc bug in object.c Modified Paths: -------------- MacRuby/trunk/lib/rdoc/parser/c.rb MacRuby/trunk/object.c Modified: MacRuby/trunk/lib/rdoc/parser/c.rb =================================================================== --- MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-08 06:19:50 UTC (rev 3211) +++ MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-08 20:34:12 UTC (rev 3212) @@ -195,7 +195,7 @@ end def do_methods - @content.scan(%r{rb_define_ + @content.scan(%r{rb_(objc_)?define_ ( singleton_method | method | @@ -206,9 +206,9 @@ \s*"([^"]+)", \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?, \s*(-?\w+)\s*\) - (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))? + (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]p?p?))? }xm) do - |type, var_name, meth_name, meth_body, param_count, source_file| + |objc, type, var_name, meth_name, meth_body, param_count, source_file| # Ignore top-object and weird struct.c dynamic stuff next if var_name == "ruby_top_self" @@ -520,7 +520,7 @@ class_obj = find_class(var_name, class_name) unless class_obj - warn("Enclosing class/module '#{const_name}' for not known") + warn("Enclosing class/module for '#{const_name}' not known") return end @@ -590,7 +590,12 @@ if source_file then file_name = File.join(@file_dir, source_file) - body = (@@known_bodies[source_file] ||= File.read(file_name)) + begin + body = (@@known_bodies[source_file] ||= File.read(file_name)) + rescue + warn "Couldn't find file #{file_name}" + body = @content + end else body = @content end Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-01-08 06:19:50 UTC (rev 3211) +++ MacRuby/trunk/object.c 2010-01-08 20:34:12 UTC (rev 3212) @@ -2993,8 +2993,8 @@ rb_objc_define_method(rb_mKernel, "__native__?", rb_obj_is_native, 0); - rb_objc_define_module_function(rb_mKernel, "sprintf", rb_f_sprintf_imp, -1); /* in sprintf.c */ - rb_objc_define_module_function(rb_mKernel, "format", rb_f_sprintf_imp, -1); /* in sprintf.c */ + rb_objc_define_module_function(rb_mKernel, "sprintf", rb_f_sprintf_imp, -1); /* in sprintf.cpp */ + rb_objc_define_module_function(rb_mKernel, "format", rb_f_sprintf_imp, -1); /* in sprintf.cpp */ rb_objc_define_module_function(rb_mKernel, "Integer", rb_f_integer, 1); rb_objc_define_module_function(rb_mKernel, "Float", rb_f_float, 1);

1 0

[3211] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3211 http://trac.macosforge.org/projects/ruby/changeset/3211 Author: lsansonetti(a)apple.com Date: 2010-01-07 22:19:50 -0800 (Thu, 07 Jan 2010) Log Message: ----------- fixed a bug in the #send method inliner where protected methods would not be callable Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-01-08 06:19:13 UTC (rev 3210) +++ MacRuby/trunk/compiler.cpp 2010-01-08 06:19:50 UTC (rev 3211) @@ -2616,7 +2616,8 @@ bb = thenBB; std::vector<Value *> new_params; new_params.push_back(compile_mcache(new_sel, false)); - new_params.push_back(params[1]); + // Compile a null top reference, to ignore protected visibility. + new_params.push_back(ConstantInt::get(RubyObjTy, 0)); new_params.push_back(params[2]); new_params.push_back(compile_sel(new_sel)); new_params.push_back(params[4]);

1 0

[3210] MacRuby/trunk/auto_zone_1060.h
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3210 http://trac.macosforge.org/projects/ruby/changeset/3210 Author: lsansonetti(a)apple.com Date: 2010-01-07 22:19:13 -0800 (Thu, 07 Jan 2010) Log Message: ----------- sync with latest SL's auto_zone.h Modified Paths: -------------- MacRuby/trunk/auto_zone_1060.h Modified: MacRuby/trunk/auto_zone_1060.h =================================================================== --- MacRuby/trunk/auto_zone_1060.h 2010-01-08 05:27:46 UTC (rev 3209) +++ MacRuby/trunk/auto_zone_1060.h 2010-01-08 06:19:13 UTC (rev 3210) @@ -1,21 +1,7 @@ /* - * Copyright (c) 2002-2009, Apple Inc. All rights reserved. - * - * @APPLE_APACHE_LICENSE_HEADER_START@ - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @APPLE_APACHE_LICENSE_HEADER_END@ + auto_zone.h + Automatic Garbage Collection. + Copyright (c) 2002-2009 Apple Inc. All rights reserved. */ #ifndef __AUTO_ZONE__ @@ -41,6 +27,8 @@ // this is used by tools to be able to introspect a zone in another process. // the introspection functions returned are required to do version checking on the zone. +#define AUTO_RETAINED_BLOCK_TYPE 0x100 /* zone enumerator returns only blocks with nonzero retain count */ + /********* External (Global) Use counting ************/ extern void auto_zone_retain(auto_zone_t *zone, void *ptr); @@ -66,6 +54,10 @@ boolean_t auto_zone_atomicCompareAndSwap(auto_zone_t *zone, void *existingValue, void *newValue, void *volatile *location, boolean_t isGlobal, boolean_t issueBarrier); // Atomically update a location with a new GC value. These use OSAtomicCompareAndSwapPtr{Barrier} with appropriate write-barrier interlocking logic. +boolean_t auto_zone_atomicCompareAndSwapPtr(auto_zone_t *zone, void *existingValue, void *newValue, void *volatile *location, boolean_t issueBarrier); + // Atomically update a location with a new GC value. These use OSAtomicCompareAndSwapPtr{Barrier} with appropriate write-barrier interlocking logic. + // This version checks location, and if it points into global storage, registers a root. + extern void *auto_zone_write_barrier_memmove(auto_zone_t *zone, void *dst, const void *src, size_t size); // copy content from an arbitrary source area to an arbitrary destination area // marking write barrier if necessary @@ -86,7 +78,8 @@ /* Memory usage */ malloc_statistics_t malloc_statistics; /* GC stats */ - uint32_t version; // reserved - 0 for now + // version 0 + uint32_t version; // set to 1 before calling /* When there is an array, 0 stands for full collection, 1 for generational */ size_t num_collections[2]; boolean_t last_collection_was_generational; @@ -97,6 +90,10 @@ auto_collection_durations_t total[2]; // running total of each field auto_collection_durations_t last[2]; // most recent result auto_collection_durations_t maximum[2]; // on a per item basis, the max. Thus, total != scan + finalize ... + // version 1 additions + size_t thread_collections_total; + size_t thread_blocks_recovered_total; + size_t thread_bytes_recovered_total; } auto_statistics_t; extern void auto_zone_statistics(auto_zone_t *zone, auto_statistics_t *stats); // set version to 0 @@ -220,13 +217,21 @@ extern void* auto_zone_allocate_object(auto_zone_t *zone, size_t size, auto_memory_type_t type, boolean_t initial_refcount_to_one, boolean_t clear); +// Create copy of AUTO_MEMORY object preserving "scanned" attribute +// If not auto memory then create unscanned memory copy +void *auto_zone_create_copy(auto_zone_t *zone, void *ptr); + + extern void auto_zone_register_thread(auto_zone_t *zone); - // threads that are using the auto collector are marked suspendable by storing a non-nil value - // in their thread local storage, using an internal pthread_key_t. extern void auto_zone_unregister_thread(auto_zone_t *zone); +extern void auto_zone_assert_thread_registered(auto_zone_t *zone); +extern void auto_zone_register_datasegment(auto_zone_t *zone, void *address, size_t size); +extern void auto_zone_unregister_datasegment(auto_zone_t *zone, void *address, size_t size); + + // Weak references // The collector maintains a weak reference system. @@ -260,6 +265,7 @@ extern void* auto_read_weak_reference(auto_zone_t *zone, void **referrer); extern void auto_zone_add_root(auto_zone_t *zone, void *address_of_root_ptr, void *value); +extern void auto_zone_remove_root(auto_zone_t *zone, void *address_of_root_ptr); extern void auto_zone_root_write_barrier(auto_zone_t *zone, void *address_of_possible_root_ptr, void *value); @@ -272,6 +278,7 @@ extern void auto_zone_set_associative_ref(auto_zone_t *zone, void *object, void *key, void *value); extern void *auto_zone_get_associative_ref(auto_zone_t *zone, void *object, void *key); +extern void auto_zone_erase_associative_refs(auto_zone_t *zone, void *object); /***** SPI ******/ @@ -279,15 +286,23 @@ extern void auto_zone_start_monitor(boolean_t force); extern void auto_zone_set_class_list(int (*get_class_list)(void **buffer, int count)); -extern unsigned int auto_zone_retain_count_no_lock(auto_zone_t *zone, const void *ptr); -extern size_t auto_zone_size_no_lock(auto_zone_t *zone, const void *ptr); extern boolean_t auto_zone_is_finalized(auto_zone_t *zone, const void *ptr); -extern void auto_zone_set_layout_type(auto_zone_t *zone, void *ptr, auto_memory_type_t type); -extern auto_memory_type_t auto_zone_get_layout_type_no_lock(auto_zone_t *zone, void *ptr); extern void auto_zone_stats(void); // write stats to stdout extern void auto_zone_write_stats(FILE *f); // write stats to the given stream extern char *auto_zone_stats_string(); // return a char * containing the stats string, which should be free()'d +extern void auto_zone_set_nofinalize(auto_zone_t *zone, void *ptr); +extern void auto_zone_set_unscanned(auto_zone_t *zone, void *ptr); +extern void auto_zone_clear_stack(auto_zone_t *zone, unsigned long options); +// Reference count logging support for ObjectAlloc et. al. + +enum { + AUTO_RETAIN_EVENT = 14, + AUTO_RELEASE_EVENT = 15 +}; +extern void (*__auto_reference_logger)(uint32_t eventtype, void *ptr, uintptr_t data); + + // Reference tracing // referrer_base[referrer_offset] -> referent @@ -305,25 +320,58 @@ auto_reference_recorder_t callback, void *stack_bottom, void *ctx); -extern void auto_enumerate_references_no_lock(auto_zone_t *zone, void *referent, auto_reference_recorder_t callback, void *stack_bottom, void *ctx); void **auto_weak_find_first_referrer(auto_zone_t *zone, void **location, unsigned long count); /************ DEPRECATED ***********/ -extern void auto_zone_write_barrier_range(auto_zone_t *zone, void *address, size_t size); - // Insufficient. Will mark values about to be stored into GC memory, but has race if GC starts in the middle. -extern void auto_zone_write_barrier(auto_zone_t *zone, void *recipient, const unsigned long offset_in_bytes, const void *new_value); extern auto_zone_t *auto_zone(void); // returns a pointer to the first garbage collected zone created. -extern const auto_statistics_t *auto_collection_statistics(auto_zone_t *zone); extern unsigned auto_zone_touched_size(auto_zone_t *zone); // conservative (upper bound) on memory touched by the allocator itself. extern double auto_zone_utilization(auto_zone_t *zone); // conservative measure of utilization of allocator touched memory. + +/************* EXPERIMENTAL *********/ +#ifdef __BLOCKS__ + +typedef void (^auto_zone_stack_dump)(const void *base, unsigned long byte_size); +typedef void (^auto_zone_register_dump)(const void *base, unsigned long byte_size); +typedef void (^auto_zone_node_dump)(const void *address, unsigned long size, unsigned int layout, unsigned long refcount); +typedef void (^auto_zone_root_dump)(const void **address); +typedef void (^auto_zone_weak_dump)(const void **address, const void *item); + +// Instruments.app utility; causes significant disruption. +// This is SPI for Apple's use only. Can and likely will change without regard to 3rd party use. +void auto_zone_dump(auto_zone_t *zone, + auto_zone_stack_dump stack_dump, + auto_zone_register_dump register_dump, + auto_zone_node_dump thread_local_node_dump, // unsupported + auto_zone_root_dump root_dump, + auto_zone_node_dump global_node_dump, + auto_zone_weak_dump weak_dump +); + +#endif + +enum { + auto_is_not_auto = 0, + auto_is_auto = (1 << 1), // always on for a start of a node + auto_is_local = (1 << 2), // is/was node local +}; + +typedef int auto_probe_results_t; + +// Instruments.app utility; causes significant disruption. +// This is SPI for Apple's use only. Can and likely will change without regard to 3rd party use. +auto_probe_results_t auto_zone_probe_unlocked(auto_zone_t *zone, void *address); +#ifdef __BLOCKS__ +void auto_zone_scan_exact(auto_zone_t *zone, void *address, void (^callback)(void *base, unsigned long byte_offset, void *candidate)); +#endif + __END_DECLS #endif /* __AUTO_ZONE__ */

1 0

[3209] MacRuby/trunk/lib/rss/utils.rb
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3209 http://trac.macosforge.org/projects/ruby/changeset/3209 Author: lsansonetti(a)apple.com Date: 2010-01-07 21:27:46 -0800 (Thu, 07 Jan 2010) Log Message: ----------- temporary fix for potential #caller out of bounds access Modified Paths: -------------- MacRuby/trunk/lib/rss/utils.rb Modified: MacRuby/trunk/lib/rss/utils.rb =================================================================== --- MacRuby/trunk/lib/rss/utils.rb 2010-01-08 04:45:43 UTC (rev 3208) +++ MacRuby/trunk/lib/rss/utils.rb 2010-01-08 05:27:46 UTC (rev 3209) @@ -10,7 +10,9 @@ end def get_file_and_line_from_caller(i=0) - file, line, = caller[i].split(':') + bt = caller + i = bt.size - 1 if i >= bt.size + file, line, = bt[i].split(':') line = line.to_i line += 1 if i.zero? [file, line]

1 0

[3208] MacRuby/trunk/include/ruby/ruby.h
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3208 http://trac.macosforge.org/projects/ruby/changeset/3208 Author: lsansonetti(a)apple.com Date: 2010-01-07 20:45:43 -0800 (Thu, 07 Jan 2010) Log Message: ----------- recognize __NSArray0 as T_ARRAY Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2010-01-08 04:45:21 UTC (rev 3207) +++ MacRuby/trunk/include/ruby/ruby.h 2010-01-08 04:45:43 UTC (rev 3208) @@ -1361,7 +1361,11 @@ if (k == (Class)rb_cCFString) { return T_STRING; } - if (k == (Class)rb_cCFArray || k == (Class)rb_cRubyArray) { + if (k == (Class)rb_cCFArray || k == (Class)rb_cRubyArray +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 + || k == (Class)rb_cNSArray0 +#endif + ) { return T_ARRAY; } if (k == (Class)rb_cCFHash) {

1 0

[3207] MacRuby/trunk/string.c
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3207 http://trac.macosforge.org/projects/ruby/changeset/3207 Author: lsansonetti(a)apple.com Date: 2010-01-07 20:45:21 -0800 (Thu, 07 Jan 2010) Log Message: ----------- fixed a bug in String#dump in case the receiver is a bytestring Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-01-08 03:58:41 UTC (rev 3206) +++ MacRuby/trunk/string.c 2010-01-08 04:45:21 UTC (rev 3207) @@ -2653,7 +2653,9 @@ rb_str_dump(VALUE str, SEL sel) { VALUE res = __rb_str_inspect(str, true); - *(VALUE *)res = *(VALUE *)str; + if (*(VALUE *)str != rb_cByteString) { + *(VALUE *)res = *(VALUE *)str; + } return res; }

1 0

[3206] MacRuby/trunk/TODO
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3206 http://trac.macosforge.org/projects/ruby/changeset/3206 Author: lsansonetti(a)apple.com Date: 2010-01-07 19:58:41 -0800 (Thu, 07 Jan 2010) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-01-08 03:14:55 UTC (rev 3205) +++ MacRuby/trunk/TODO 2010-01-08 03:58:41 UTC (rev 3206) @@ -7,6 +7,7 @@ [X] non-ASCII regexp [/] 32-bit should be back [X] macruby should support #require calls when assembling a binary +[ ] change copyright headers for 2010 For 0.5 (must do):

1 0

[3205] MacRuby/trunk/lib/rdoc/parser/c.rb
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3205 http://trac.macosforge.org/projects/ruby/changeset/3205 Author: lsansonetti(a)apple.com Date: 2010-01-07 19:14:55 -0800 (Thu, 07 Jan 2010) Log Message: ----------- revert r3204 because it breaks the doc build Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3204 Modified Paths: -------------- MacRuby/trunk/lib/rdoc/parser/c.rb Modified: MacRuby/trunk/lib/rdoc/parser/c.rb =================================================================== --- MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-07 23:31:55 UTC (rev 3204) +++ MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-08 03:14:55 UTC (rev 3205) @@ -195,7 +195,7 @@ end def do_methods - @content.scan(%r{rb_(objc_)?define_ + @content.scan(%r{rb_define_ ( singleton_method | method | @@ -208,7 +208,7 @@ \s*(-?\w+)\s*\) (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))? }xm) do - |objc, type, var_name, meth_name, meth_body, param_count, source_file| + |type, var_name, meth_name, meth_body, param_count, source_file| # Ignore top-object and weird struct.c dynamic stuff next if var_name == "ruby_top_self"

1 0

[3204] MacRuby/trunk/lib/rdoc/parser/c.rb
by source_changes＠macosforge.org 07 Jan '10

07 Jan '10

Revision: 3204 http://trac.macosforge.org/projects/ruby/changeset/3204 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-07 15:31:55 -0800 (Thu, 07 Jan 2010) Log Message: ----------- Modified Rdoc c parser to work with rb_objc_define_method Modified Paths: -------------- MacRuby/trunk/lib/rdoc/parser/c.rb Modified: MacRuby/trunk/lib/rdoc/parser/c.rb =================================================================== --- MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-07 23:28:38 UTC (rev 3203) +++ MacRuby/trunk/lib/rdoc/parser/c.rb 2010-01-07 23:31:55 UTC (rev 3204) @@ -195,7 +195,7 @@ end def do_methods - @content.scan(%r{rb_define_ + @content.scan(%r{rb_(objc_)?define_ ( singleton_method | method | @@ -208,7 +208,7 @@ \s*(-?\w+)\s*\) (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))? }xm) do - |type, var_name, meth_name, meth_body, param_count, source_file| + |objc, type, var_name, meth_name, meth_body, param_count, source_file| # Ignore top-object and weird struct.c dynamic stuff next if var_name == "ruby_top_self"

1 0