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

[2935] MacRuby/trunk/test_vm/block.rb
by source_changes＠macosforge.org 31 Oct '09

31 Oct '09

Revision: 2935 http://trac.macosforge.org/projects/ruby/changeset/2935 Author: lsansonetti(a)apple.com Date: 2009-10-30 22:50:02 -0700 (Fri, 30 Oct 2009) Log Message: ----------- added 2 tests Modified Paths: -------------- MacRuby/trunk/test_vm/block.rb Modified: MacRuby/trunk/test_vm/block.rb =================================================================== --- MacRuby/trunk/test_vm/block.rb 2009-10-31 05:49:51 UTC (rev 2934) +++ MacRuby/trunk/test_vm/block.rb 2009-10-31 05:50:02 UTC (rev 2935) @@ -689,3 +689,24 @@ end f } + +assert ':ok', %{ + def f + b = Proc.new { return :ok } + b.call + 42 + end + p f +} + +assert ':ok', %{ + def f2(b) + b.call + end + def f + b = Proc.new { return :ok } + f2(b) + 42 + end + p f +}

1 0

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

31 Oct '09

Revision: 2934 http://trac.macosforge.org/projects/ruby/changeset/2934 Author: lsansonetti(a)apple.com Date: 2009-10-30 22:49:51 -0700 (Fri, 30 Oct 2009) Log Message: ----------- return-from-block is now active for further dispatch calls inside the same method + do not return-from-block from lambdas (to mimic MRI 1.9) Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-31 05:48:34 UTC (rev 2933) +++ MacRuby/trunk/compiler.cpp 2009-10-31 05:49:51 UTC (rev 2934) @@ -1628,14 +1628,17 @@ RoxorCompiler::compile_return_from_block(Value *val, int id) { if (returnFromBlockFunc == NULL) { - // void rb_vm_return_from_block(VALUE val, int id); + // void rb_vm_return_from_block(VALUE val, int id, + // rb_vm_block_t *current_block); returnFromBlockFunc = cast<Function>( module->getOrInsertFunction("rb_vm_return_from_block", - VoidTy, RubyObjTy, Int32Ty, NULL)); + VoidTy, RubyObjTy, Int32Ty, PtrTy, NULL)); } std::vector<Value *> params; params.push_back(val); params.push_back(ConstantInt::get(Int32Ty, id)); + params.push_back(running_block); + compile_protected_call(returnFromBlockFunc, params); } @@ -4948,8 +4951,6 @@ bool old_current_block = current_block; bool old_current_block_chain = current_block_chain; int old_return_from_block = return_from_block; - BasicBlock *old_rescue_invoke_bb = rescue_invoke_bb; - BasicBlock *old_rescue_rethrow_bb = rescue_rethrow_bb; bool old_dynamic_class = dynamic_class; current_mid = 0; @@ -5015,9 +5016,7 @@ if (return_from_block_bb != NULL) { BasicBlock *old_bb = bb; bb = return_from_block_bb; - compile_return_from_block_handler(return_from_block); - rescue_rethrow_bb = old_rescue_rethrow_bb; - rescue_invoke_bb = old_rescue_invoke_bb; + compile_return_from_block_handler(return_from_block); bb = old_bb; return_from_block = old_return_from_block; } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-31 05:48:34 UTC (rev 2933) +++ MacRuby/trunk/vm.cpp 2009-10-31 05:49:51 UTC (rev 2934) @@ -3098,14 +3098,17 @@ extern "C" void -rb_vm_return_from_block(VALUE val, int id) +rb_vm_return_from_block(VALUE val, int id, rb_vm_block_t *running_block) { - RoxorReturnFromBlockException *exc = new RoxorReturnFromBlockException(); - - exc->val = val; - exc->id = id; - - throw exc; + // Do not trigger a return from the calling scope if the running block + // is a lambda, to conform to the ruby 1.9 specifications. + if (!(running_block->flags & VM_BLOCK_LAMBDA)) { + RoxorReturnFromBlockException *exc = + new RoxorReturnFromBlockException(); + exc->val = val; + exc->id = id; + throw exc; + } } extern "C" std::type_info *__cxa_current_exception_type(void);

1 0

[2933] MacRuby/trunk/spec/frozen/core/thread/shared/exit.rb
by source_changes＠macosforge.org 31 Oct '09

31 Oct '09

Revision: 2933 http://trac.macosforge.org/projects/ruby/changeset/2933 Author: lsansonetti(a)apple.com Date: 2009-10-30 22:48:34 -0700 (Fri, 30 Oct 2009) Log Message: ----------- fixed a bug in a spec (doesn't really matter since the spec is crap anyway) Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/thread/shared/exit.rb Modified: MacRuby/trunk/spec/frozen/core/thread/shared/exit.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/thread/shared/exit.rb 2009-10-31 03:38:49 UTC (rev 2932) +++ MacRuby/trunk/spec/frozen/core/thread/shared/exit.rb 2009-10-31 05:48:34 UTC (rev 2933) @@ -87,7 +87,7 @@ it "killing dying running does nothing" do in_ensure_clause = false - exit_loop = true + exit_loop = false t = ThreadSpecs.dying_thread_ensures do in_ensure_clause = true loop { if exit_loop then break end }

1 0

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

31 Oct '09

Revision: 2932 http://trac.macosforge.org/projects/ruby/changeset/2932 Author: lsansonetti(a)apple.com Date: 2009-10-30 20:38:49 -0700 (Fri, 30 Oct 2009) Log Message: ----------- added another thread-safe problem Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-31 02:34:53 UTC (rev 2931) +++ MacRuby/trunk/TODO 2009-10-31 03:38:49 UTC (rev 2932) @@ -60,6 +60,8 @@ [ ] method cache is not thread safe [X] block dvars are corrupted in case the receiver leaves ex: 10.times { |i| Thread.new { p i } }; sleep 1 + [ ] blocks are not reentrant + ex: b=Proc.new{}; 100.times{Thread.new{100.times{b.call}}}; sleep 1 [X] lazy GCD VMs are never finalized [X] random.c is not thread-safe and should be rewritten using random(3)

1 0

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

31 Oct '09

Revision: 2931 http://trac.macosforge.org/projects/ruby/changeset/2931 Author: lsansonetti(a)apple.com Date: 2009-10-30 19:34:53 -0700 (Fri, 30 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-31 02:34:41 UTC (rev 2930) +++ MacRuby/trunk/TODO 2009-10-31 02:34:53 UTC (rev 2931) @@ -52,7 +52,7 @@ [X] sync with LLVM 2.6/ToT [ ] non-ASCII regexp [ ] leaks - [ ] implement ~RoxorVM + [X] implement ~RoxorVM [ ] fix exception leak [X] delete unused functions after execution [X] delete unused NODE* after execution

1 0

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

31 Oct '09

Revision: 2930 http://trac.macosforge.org/projects/ruby/changeset/2930 Author: lsansonetti(a)apple.com Date: 2009-10-30 19:34:41 -0700 (Fri, 30 Oct 2009) Log Message: ----------- implemented VM cleanup + make sure Threads do not leak resources anymore Modified Paths: -------------- MacRuby/trunk/include/ruby/intern.h MacRuby/trunk/thread.c MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/include/ruby/intern.h =================================================================== --- MacRuby/trunk/include/ruby/intern.h 2009-10-30 19:05:50 UTC (rev 2929) +++ MacRuby/trunk/include/ruby/intern.h 2009-10-31 02:34:41 UTC (rev 2930) @@ -612,6 +612,7 @@ VALUE rb_struct_define_without_accessor(const char *, VALUE, rb_alloc_func_t, ...); /* thread.c */ VALUE rb_thgroup_add(VALUE group, VALUE thread); +void rb_thread_remove_from_group(VALUE thread); typedef void rb_unblock_function_t(void *); typedef VALUE rb_blocking_function_t(void *); VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1, Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2009-10-30 19:05:50 UTC (rev 2929) +++ MacRuby/trunk/thread.c 2009-10-31 02:34:41 UTC (rev 2930) @@ -11,15 +11,25 @@ #include "ruby/node.h" #include "vm.h" +VALUE rb_cThread; +VALUE rb_cThGroup; +VALUE rb_cMutex; + typedef struct rb_vm_mutex { pthread_mutex_t mutex; rb_vm_thread_t *thread; } rb_vm_mutex_t; -VALUE rb_cThread; -VALUE rb_cThGroup; -VALUE rb_cMutex; +#define GetMutexPtr(obj) ((rb_vm_mutex_t *)DATA_PTR(obj)) +typedef struct { + bool enclosed; + VALUE threads; + VALUE mutex; +} rb_thread_group_t; + +#define GetThreadGroupPtr(obj) ((rb_thread_group_t *)DATA_PTR(obj)) + #if 0 static VALUE thread_s_new(int argc, VALUE *argv, VALUE klass) @@ -53,12 +63,21 @@ // Retain the Thread object to avoid a potential GC, the corresponding // release is done in rb_vm_thread_run(). - rb_objc_retain((void *)thread); + GC_RETAIN(thread); - if (pthread_create(&t->thread, NULL, (void *(*)(void *))rb_vm_thread_run, + // Prepare attributes for the thread. + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + + // Launch it. + if (pthread_create(&t->thread, &attr, (void *(*)(void *))rb_vm_thread_run, (void *)thread) != 0) { rb_sys_fail("pthread_create() failed"); } + pthread_attr_destroy(&attr); return thread; } @@ -138,7 +157,14 @@ if (t->status != THREAD_DEAD) { if (timeout == Qnil) { // No timeout given: block until the thread finishes. - pthread_assert(pthread_join(t->thread, NULL)); + //pthread_assert(pthread_join(t->thread, NULL)); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = 10000000; + while (t->status != THREAD_DEAD) { + nanosleep(&ts, NULL); + pthread_yield_np(); + } } else { // Timeout given: sleep then check if the thread is dead. @@ -1083,13 +1109,9 @@ * were created. */ -typedef struct { - bool enclosed; - VALUE threads; -} rb_thread_group_t; +static VALUE mutex_s_alloc(VALUE self, SEL sel); +static VALUE mutex_initialize(VALUE self, SEL sel); -#define GetThreadGroupPtr(obj) ((rb_thread_group_t *)DATA_PTR(obj)) - static VALUE thgroup_s_alloc(VALUE self, SEL sel) { @@ -1097,6 +1119,11 @@ sizeof(rb_thread_group_t)); t->enclosed = false; GC_WB(&t->threads, rb_ary_new()); + + VALUE mutex = mutex_s_alloc(rb_cMutex, 0); + mutex_initialize(mutex, 0); + GC_WB(&t->mutex, mutex); + return Data_Wrap_Struct(rb_cThGroup, NULL, NULL, t); } @@ -1181,6 +1208,18 @@ * tg group now #<Thread:0x401b3c90> */ +static inline void +thgroup_lock(rb_thread_group_t *tg) +{ + pthread_assert(pthread_mutex_lock(&GetMutexPtr(tg->mutex)->mutex)); +} + +static inline void +thgroup_unlock(rb_thread_group_t *tg) +{ + pthread_assert(pthread_mutex_unlock(&GetMutexPtr(tg->mutex)->mutex)); +} + static VALUE thgroup_add(VALUE group, SEL sel, VALUE thread) { @@ -1197,10 +1236,14 @@ rb_raise(rb_eThreadError, "can't move from the enclosed thread group"); } + thgroup_lock(old_tg); rb_ary_delete(old_tg->threads, thread); + thgroup_unlock(old_tg); } + thgroup_lock(new_tg); rb_ary_push(new_tg->threads, thread); + thgroup_unlock(new_tg); GC_WB(&t->group, group); return group; @@ -1212,6 +1255,21 @@ return thgroup_add(group, 0, thread); } +void +rb_thread_remove_from_group(VALUE thread) +{ + rb_vm_thread_t *t = GetThreadPtr(thread); + rb_thread_group_t *tg = GetThreadGroupPtr(t->group); + thgroup_lock(tg); + if (rb_ary_delete(tg->threads, thread) != thread) { + printf("trying to remove a thread (%p) from a group that doesn't "\ + "contain it\n", (void *)thread); + abort(); + } + thgroup_unlock(tg); + t->group = Qnil; +} + /* * Document-class: Mutex * @@ -1251,8 +1309,6 @@ return Data_Wrap_Struct(rb_cMutex, NULL, NULL, t); } -#define GetMutexPtr(obj) ((rb_vm_mutex_t *)DATA_PTR(obj)) - static VALUE mutex_initialize(VALUE self, SEL sel) { Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-30 19:05:50 UTC (rev 2929) +++ MacRuby/trunk/vm.cpp 2009-10-31 02:34:41 UTC (rev 2930) @@ -258,7 +258,6 @@ RoxorCore::~RoxorCore(void) { - call_all_finalizers(); // TODO } @@ -332,7 +331,17 @@ RoxorVM::~RoxorVM(void) { - // TODO + for (std::map<void *, rb_vm_block_t *>::iterator i = blocks.begin(); + i != blocks.end(); + ++i) { + GC_RELEASE(i->second); + } + blocks.clear(); + + GC_RELEASE(backref); + GC_RELEASE(broken_with); + GC_RELEASE(last_status); + GC_RELEASE(errinfo); } static void @@ -3630,7 +3639,7 @@ s->throw_value = Qnil; s->nested = 1; catch_jmp_bufs[tag] = s; - rb_objc_retain((void *)tag); + GC_RETAIN(tag); } else { s = iter->second; @@ -3654,7 +3663,7 @@ s = iter->second; free(s); catch_jmp_bufs.erase(iter); - rb_objc_release((void *)tag); + GC_RELEASE(tag); } return retval; @@ -3888,7 +3897,7 @@ GET_CORE()->register_thread(thread); // Release the thread now. - rb_objc_release((void *)thread); + GC_RELEASE(thread); rb_vm_thread_t *t = GetThreadPtr(thread); @@ -3921,6 +3930,7 @@ pthread_cleanup_pop(0); + rb_thread_remove_from_group(thread); GET_CORE()->unregister_thread(thread); rb_objc_gc_unregister_thread(); @@ -4447,7 +4457,11 @@ printf("functions all=%ld compiled=%ld\n", RoxorCompiler::module->size(), GET_CORE()->get_functions_compiled()); #endif - - delete RoxorCore::shared; - RoxorCore::shared = NULL; + + + // XXX: deleting the core is not safe at this point because there might be + // threads still running and trying to unregister. +// delete RoxorCore::shared; +// RoxorCore::shared = NULL; + GET_CORE()->call_all_finalizers(); }

1 0

[2929] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 30 Oct '09

30 Oct '09

Revision: 2929 http://trac.macosforge.org/projects/ruby/changeset/2929 Author: lsansonetti(a)apple.com Date: 2009-10-30 12:05:50 -0700 (Fri, 30 Oct 2009) Log Message: ----------- only deploy the Current version of MacRuby Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2009-10-30 06:50:54 UTC (rev 2928) +++ MacRuby/trunk/bin/ruby_deploy 2009-10-30 19:05:50 UTC (rev 2929) @@ -69,6 +69,14 @@ dirs << 'lib/ruby/Gems' # TODO add gems support dirs.each { |x| rm_rf(File.join(app_macruby_usr, x)) } + # Only keep the Current version of the MacRuby.framework copy. + Dir.glob(File.join(app_macruby, 'Versions/*')).select { |x| + base = File.basename(x) + base != MACRUBY_VERSION and base != 'Current' + }.each { |x| + rm_rf(x) + } + # Hack the application binaries to link against the MacRuby.framework copy. patterns = [File.join(@app_bundle, 'Contents/MacOS/*'), File.join(app_macruby_usr, 'lib/ruby/**/*.{bundle,rbo}')] patterns.each do |pat|

1 0

[2928] MacRuby/trunk/array.c
by source_changes＠macosforge.org 30 Oct '09

30 Oct '09

Revision: 2928 http://trac.macosforge.org/projects/ruby/changeset/2928 Author: lsansonetti(a)apple.com Date: 2009-10-29 23:50:54 -0700 (Thu, 29 Oct 2009) Log Message: ----------- rb_ary_delete(): never yield current block Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2009-10-30 06:34:54 UTC (rev 2927) +++ MacRuby/trunk/array.c 2009-10-30 06:50:54 UTC (rev 2928) @@ -2224,8 +2224,8 @@ * a.delete("z") { "not found" } #=> "not found" */ -static VALUE -rb_ary_delete_imp(VALUE ary, SEL sel, VALUE item) +static inline bool +rb_ary_delete0(VALUE ary, VALUE item) { rb_ary_modify(ary); @@ -2252,6 +2252,14 @@ changed = true; } } + + return changed; +} + +static VALUE +rb_ary_delete_imp(VALUE ary, SEL sel, VALUE item) +{ + const bool changed = rb_ary_delete0(ary, item); if (!changed) { if (rb_block_given_p()) { return rb_yield(item); @@ -2264,7 +2272,7 @@ VALUE rb_ary_delete(VALUE ary, VALUE item) { - return rb_ary_delete_imp(ary, 0, item); + return rb_ary_delete0(ary, item) ? item : Qnil; } VALUE

1 0

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

30 Oct '09

Revision: 2927 http://trac.macosforge.org/projects/ruby/changeset/2927 Author: lsansonetti(a)apple.com Date: 2009-10-29 23:34:54 -0700 (Thu, 29 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-30 06:34:13 UTC (rev 2926) +++ MacRuby/trunk/TODO 2009-10-30 06:34:54 UTC (rev 2927) @@ -60,7 +60,7 @@ [ ] method cache is not thread safe [X] block dvars are corrupted in case the receiver leaves ex: 10.times { |i| Thread.new { p i } }; sleep 1 - [ ] lazy threads (GCD, etc.) are never finalized + [X] lazy GCD VMs are never finalized [X] random.c is not thread-safe and should be rewritten using random(3) For 0.6:

1 0

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

30 Oct '09

Revision: 2926 http://trac.macosforge.org/projects/ruby/changeset/2926 Author: lsansonetti(a)apple.com Date: 2009-10-29 23:34:13 -0700 (Thu, 29 Oct 2009) Log Message: ----------- unregister VM objects created from GCD pthreads Modified Paths: -------------- MacRuby/trunk/eval.c MacRuby/trunk/gcd.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/eval.c =================================================================== --- MacRuby/trunk/eval.c 2009-10-30 04:12:21 UTC (rev 2925) +++ MacRuby/trunk/eval.c 2009-10-30 06:34:13 UTC (rev 2926) @@ -38,6 +38,7 @@ void Init_ext(void); void Init_PreGC(void); void Init_PreVM(void); +void Init_PreGCD(void); bool ruby_dlog_enabled = false; FILE *ruby_dlog_file = NULL; @@ -73,6 +74,7 @@ Init_PreGC(); Init_PreVM(); + Init_PreGCD(); rb_call_inits(); ruby_prog_init(); Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-10-30 04:12:21 UTC (rev 2925) +++ MacRuby/trunk/gcd.c 2009-10-30 06:34:13 UTC (rev 2926) @@ -846,7 +846,41 @@ } } +// GCD callbacks that will let us know when a POSIX thread is started / ended. +// We can appropriately create/delete a RoxorVM object based on that. +static void (*old_dispatch_begin_thread_4GC)(void) = NULL; +static void (*old_dispatch_end_thread_4GC)(void) = NULL; +extern void (*dispatch_begin_thread_4GC)(void); +extern void (*dispatch_end_thread_4GC)(void); + +static void +rb_dispatch_begin_thread(void) +{ + if (old_dispatch_begin_thread_4GC != NULL) { + (*old_dispatch_begin_thread_4GC)(); + } + rb_vm_register_current_alien_thread(); +} + +static void +rb_dispatch_end_thread(void) +{ + if (old_dispatch_end_thread_4GC != NULL) { + (*old_dispatch_end_thread_4GC)(); + } + rb_vm_unregister_current_alien_thread(); +} + void +Init_PreGCD(void) +{ + old_dispatch_begin_thread_4GC = dispatch_begin_thread_4GC; + old_dispatch_end_thread_4GC = dispatch_end_thread_4GC; + dispatch_begin_thread_4GC = rb_dispatch_begin_thread; + dispatch_end_thread_4GC = rb_dispatch_end_thread; +} + +void Init_Dispatch(void) { high_priority_id = rb_intern("high"); @@ -928,6 +962,12 @@ #else void +Init_PreGCD(void) +{ + // Do nothing... +} + +void Init_Dispatch(void) { // Do nothing... Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-30 04:12:21 UTC (rev 2925) +++ MacRuby/trunk/vm.cpp 2009-10-30 06:34:13 UTC (rev 2926) @@ -4374,13 +4374,54 @@ rb_vm_thread_pre_init(t, NULL, 0, NULL, (void *)this); t->thread = pthread_self(); - VALUE main = Data_Wrap_Struct(rb_cThread, NULL, NULL, t); - GET_CORE()->register_thread(main); - this->set_thread(main); + VALUE thread = Data_Wrap_Struct(rb_cThread, NULL, NULL, t); + GET_CORE()->register_thread(thread); + this->set_thread(thread); } extern "C" void +rb_vm_register_current_alien_thread(void) +{ + // This callback is not used, we prefer to create RoxorVM objects + // lazily (in RoxorVM::current()), for performance reasons, because the + // callback is called *a lot* and most of the time from various parts of + // the system which will never ask us to execute Ruby code. +#if 0 + if (GET_CORE()->get_running()) { + printf("registered alien thread %p\n", pthread_self()); + RoxorVM *vm = new RoxorVM(); + vm->setup_from_current_thread(); + } +#endif +} + +extern "C" +void +rb_vm_unregister_current_alien_thread(void) +{ + // Check if the current pthread has been registered. + GET_CORE()->lock(); + pthread_t self = pthread_self(); + VALUE ary = GET_CORE()->get_threads(); + bool need_to_unregister = false; + for (int i = 0; i < RARRAY_LEN(ary); i++) { + VALUE t = RARRAY_AT(ary, i); + if (GetThreadPtr(t)->thread == self) { + need_to_unregister = true; + } + } + GET_CORE()->unlock(); + + // If yes, appropriately unregister it. + if (need_to_unregister) { + //printf("unregistered alien thread %p\n", pthread_self()); + GET_CORE()->unregister_thread(GET_VM()->get_thread()); + } +} + +extern "C" +void Init_PostVM(void) { // Create and register the main thread. Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-30 04:12:21 UTC (rev 2925) +++ MacRuby/trunk/vm.h 2009-10-30 06:34:13 UTC (rev 2926) @@ -394,6 +394,9 @@ void rb_vm_thread_cancel(rb_vm_thread_t *t); void rb_vm_thread_raise(rb_vm_thread_t *t, VALUE exc); +void rb_vm_register_current_alien_thread(void); +void rb_vm_unregister_current_alien_thread(void); + bool rb_vm_abort_on_exception(void); void rb_vm_set_abort_on_exception(bool flag); @@ -811,7 +814,6 @@ // create a new VM object just for this thread. // XXX the VM object is never detroyed. RoxorVM *new_vm = new RoxorVM(); - pthread_setspecific(vm_thread_key, (void *)new_vm); new_vm->setup_from_current_thread(); return new_vm; }

1 0