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

[1944] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1944 http://trac.macosforge.org/projects/ruby/changeset/1944 Author: lsansonetti(a)apple.com Date: 2009-06-26 22:57:24 -0700 (Fri, 26 Jun 2009) Log Message: ----------- more MT work Modified Paths: -------------- MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-27 02:04:20 UTC (rev 1943) +++ MacRuby/branches/experimental/thread.c 2009-06-27 05:57:24 UTC (rev 1944) @@ -16,16 +16,6 @@ rb_vm_thread_t *thread; } rb_vm_mutex_t; -#define assert_ok(call) \ - do { \ - const int __r = call; \ - if (__r != 0) { \ - rb_raise(rb_eRuntimeError, "pthread operation failed: error %d", \ - __r); \ - } \ - } \ - while (0) - VALUE rb_cThread; VALUE rb_cMutex; @@ -136,16 +126,36 @@ static VALUE thread_join_m(VALUE self, SEL sel, int argc, VALUE *argv) { - if (argc != 0) { - rb_raise(rb_eArgError, - "calling #join with an argument is not implemented yet"); - } + VALUE timeout; + rb_scan_args(argc, argv, "01", &timeout); + rb_vm_thread_t *t = GetThreadPtr(self); - if (t->status != THREAD_DEAD) { - assert(pthread_join(t->thread, NULL) == 0); + if (t->status == THREAD_DEAD) { + return self; } + if (timeout == Qnil) { + // No timeout given: block until the thread finishes. + pthread_assert(pthread_join(t->thread, NULL)); + } + else { + // Timeout given: sleep then check if the thread is dead. + // TODO do multiple sleeps instead of only one. + struct timeval tv = rb_time_interval(timeout); + struct timespec ts; + ts.tv_sec = tv.tv_sec; + ts.tv_nsec = tv.tv_usec * 1000; + while (ts.tv_nsec >= 1000000000) { + ts.tv_sec += 1; + ts.tv_nsec -= 1000000000; + } + nanosleep(&ts, NULL); + if (t->status != THREAD_DEAD) { + return Qnil; + } + } + return self; } @@ -558,6 +568,11 @@ static VALUE rb_thread_status(VALUE thread, SEL sel) { + rb_vm_thread_t *t = GetThreadPtr(thread); + if (t->status == THREAD_DEAD) { + // TODO should return Qnil in case the thread got an exception. + return Qfalse; + } return rb_str_new2(rb_thread_status_cstr(thread)); } @@ -1162,7 +1177,7 @@ static VALUE mutex_initialize(VALUE self, SEL sel) { - assert_ok(pthread_mutex_init(&GetMutexPtr(self)->mutex, NULL)); + pthread_assert(pthread_mutex_init(&GetMutexPtr(self)->mutex, NULL)); return self; } @@ -1215,7 +1230,7 @@ } current->status = THREAD_SLEEP; - assert_ok(pthread_mutex_lock(&m->mutex)); + pthread_assert(pthread_mutex_lock(&m->mutex)); current->status = THREAD_ALIVE; m->thread = current; @@ -1239,7 +1254,7 @@ "Attempt to unlock a mutex which is not locked"); } - assert_ok(pthread_mutex_unlock(&m->mutex)); + pthread_assert(pthread_mutex_unlock(&m->mutex)); m->thread = 0; return self; Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-27 02:04:20 UTC (rev 1943) +++ MacRuby/branches/experimental/vm.cpp 2009-06-27 05:57:24 UTC (rev 1944) @@ -188,7 +188,7 @@ multithreaded = false; abort_on_exception = false; - assert(pthread_mutex_init(&gl, 0) == 0); + pthread_assert(pthread_mutex_init(&gl, 0)); load_path = rb_ary_new(); rb_objc_retain((void *)load_path); @@ -4340,7 +4340,7 @@ unlock(); rb_vm_thread_t *t = GetThreadPtr(thread); - assert(pthread_setspecific(RoxorVM::vm_thread_key, t->vm) == 0); + pthread_assert(pthread_setspecific(RoxorVM::vm_thread_key, t->vm)); RoxorVM *vm = (RoxorVM *)t->vm; vm->set_thread(thread); @@ -4364,19 +4364,19 @@ // The mutex is already locked, which means we are being called from // a cancellation point inside the wait logic. Let's unlock the mutex // and try again. - assert(pthread_mutex_unlock(&t->sleep_mutex) == 0); - assert(pthread_mutex_destroy(&t->sleep_mutex) == 0); + pthread_assert(pthread_mutex_unlock(&t->sleep_mutex)); + pthread_assert(pthread_mutex_destroy(&t->sleep_mutex)); } else if (code != 0) { abort(); } - assert(pthread_cond_destroy(&t->sleep_cond) == 0); + pthread_assert(pthread_cond_destroy(&t->sleep_cond)); RoxorVM *vm = (RoxorVM *)t->vm; delete vm; t->vm = NULL; - assert(pthread_setspecific(RoxorVM::vm_thread_key, NULL) == 0); + pthread_assert(pthread_setspecific(RoxorVM::vm_thread_key, NULL)); t->status = THREAD_DEAD; } @@ -4410,6 +4410,11 @@ rb_vm_thread_t *t = GetThreadPtr(thread); + // Normally the pthread ID is set into the VM structure in the other + // thread right after pthread_create(), but we might run before the + // assignment! + t->thread = pthread_self(); + try { VALUE val = rb_vm_block_eval(t->body, t->argc, t->argv); GC_WB(&t->value, val); @@ -4493,15 +4498,15 @@ t->status = THREAD_ALIVE; t->in_cond_wait = false; - assert(pthread_mutex_init(&t->sleep_mutex, NULL) == 0); - assert(pthread_cond_init(&t->sleep_cond, NULL) == 0); + pthread_assert(pthread_mutex_init(&t->sleep_mutex, NULL)); + pthread_assert(pthread_cond_init(&t->sleep_cond, NULL)); } static inline void pre_wait(rb_vm_thread_t *t) { + pthread_assert(pthread_mutex_lock(&t->sleep_mutex)); t->status = THREAD_SLEEP; - assert(pthread_mutex_lock(&t->sleep_mutex) == 0); t->in_cond_wait = true; } @@ -4509,7 +4514,7 @@ post_wait(rb_vm_thread_t *t) { t->in_cond_wait = false; - assert(pthread_mutex_unlock(&t->sleep_mutex) == 0); + pthread_assert(pthread_mutex_unlock(&t->sleep_mutex)); if (t->status == THREAD_KILLED) { rb_vm_thread_throw_kill(); } @@ -4552,14 +4557,6 @@ post_wait(t); } -static inline void -signal_thread(rb_vm_thread_t *t) -{ - assert(pthread_mutex_lock(&t->sleep_mutex) == 0); - assert(pthread_cond_signal(&t->sleep_cond) == 0); - assert(pthread_mutex_unlock(&t->sleep_mutex) == 0); -} - extern "C" void rb_vm_thread_wakeup(rb_vm_thread_t *t) @@ -4568,7 +4565,9 @@ rb_raise(rb_eThreadError, "can't wake up thread from the death"); } if (t->status == THREAD_SLEEP && t->in_cond_wait) { - signal_thread(t); + pthread_assert(pthread_mutex_lock(&t->sleep_mutex)); + pthread_assert(pthread_cond_signal(&t->sleep_cond)); + pthread_assert(pthread_mutex_unlock(&t->sleep_mutex)); } } @@ -4576,22 +4575,26 @@ void rb_vm_thread_cancel(rb_vm_thread_t *t) { - t->status = THREAD_KILLED; - if (t->thread == pthread_self()) { - rb_vm_thread_throw_kill(); - } - else { - if (t->in_cond_wait) { - // We are trying to kill a thread which is currently waiting - // for a condition variable (#sleep). Instead of canceling the - // thread, we are simply signaling the variable, and the thread - // will autodestroy itself, to work around a stack unwinding bug - // in the Mac OS X pthread implementation that messes our C++ - // exception handlers. - signal_thread(t); + if (t->status != THREAD_KILLED && t->status != THREAD_DEAD) { + t->status = THREAD_KILLED; + if (t->thread == pthread_self()) { + rb_vm_thread_throw_kill(); } else { - assert(pthread_cancel(t->thread) == 0); + pthread_assert(pthread_mutex_lock(&t->sleep_mutex)); + if (t->in_cond_wait) { + // We are trying to kill a thread which is currently waiting + // for a condition variable (#sleep). Instead of canceling the + // thread, we are simply signaling the variable, and the thread + // will autodestroy itself, to work around a stack unwinding + // bug in the Mac OS X pthread implementation that messes our + // C++ exception handlers. + pthread_assert(pthread_cond_signal(&t->sleep_cond)); + } + else { + pthread_assert(pthread_cancel(t->thread)); + } + pthread_assert(pthread_mutex_unlock(&t->sleep_mutex)); } } } @@ -4650,7 +4653,7 @@ RoxorCore::shared = new RoxorCore(); RoxorVM::main = new RoxorVM(); - assert(pthread_key_create(&RoxorVM::vm_thread_key, NULL) == 0); + pthread_assert(pthread_key_create(&RoxorVM::vm_thread_key, NULL)); setup_builtin_stubs(); Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-27 02:04:20 UTC (rev 1943) +++ MacRuby/branches/experimental/vm.h 2009-06-27 05:57:24 UTC (rev 1944) @@ -80,6 +80,17 @@ #include <pthread.h> +#define pthread_assert(cmd) \ + do { \ + const int code = cmd; \ + if (code != 0) { \ + printf("pthread command `%s' failed: %s (%d)\n", \ + #cmd, strerror(code), code); \ + abort(); \ + } \ + } \ + while (0) + typedef struct rb_vm_thread { pthread_t thread; rb_vm_block_t *body;

1 0

[1943] MacRuby/branches/experimental/spec/frozen/core/thread/stop_spec.rb
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1943 http://trac.macosforge.org/projects/ruby/changeset/1943 Author: lsansonetti(a)apple.com Date: 2009-06-26 19:04:20 -0700 (Fri, 26 Jun 2009) Log Message: ----------- 1.9.1 -> 1.9 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/stop_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/stop_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/stop_spec.rb 2009-06-27 02:04:02 UTC (rev 1942) +++ MacRuby/branches/experimental/spec/frozen/core/thread/stop_spec.rb 2009-06-27 02:04:20 UTC (rev 1943) @@ -10,7 +10,7 @@ t.value.should == 5 end - ruby_version_is ""..."1.9.1" do + ruby_version_is ""..."1.9" do it "resets Thread.critical to false" do t = Thread.new { Thread.critical = true; Thread.stop } Thread.pass while t.status and t.status != 'sleep'

1 0

[1942] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1942 http://trac.macosforge.org/projects/ruby/changeset/1942 Author: lsansonetti(a)apple.com Date: 2009-06-26 19:04:02 -0700 (Fri, 26 Jun 2009) Log Message: ----------- more MT compliance Modified Paths: -------------- MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-27 01:24:26 UTC (rev 1941) +++ MacRuby/branches/experimental/thread.c 2009-06-27 02:04:02 UTC (rev 1942) @@ -313,7 +313,7 @@ rb_thread_wakeup(VALUE thread, SEL sel) { rb_vm_thread_wakeup(GetThreadPtr(thread)); - return Qnil; + return thread; } /* @@ -338,8 +338,9 @@ static VALUE rb_thread_run(VALUE thread, SEL sel) { - // On MacRuby, #wakeup and #run are the same. - return rb_thread_wakeup(thread, 0); + rb_vm_thread_wakeup(GetThreadPtr(thread)); + pthread_yield_np(); + return thread; } /* Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-27 01:24:26 UTC (rev 1941) +++ MacRuby/branches/experimental/vm.cpp 2009-06-27 02:04:02 UTC (rev 1942) @@ -4409,6 +4409,7 @@ pthread_cleanup_push(rb_vm_thread_destructor, (void *)thread); rb_vm_thread_t *t = GetThreadPtr(thread); + try { VALUE val = rb_vm_block_eval(t->body, t->argc, t->argv); GC_WB(&t->value, val); @@ -4416,6 +4417,7 @@ catch (...) { // TODO handle thread-level exceptions. //printf("exception raised inside thread %p\n", pthread_self()); + t->value = Qfalse; } pthread_cleanup_pop(0);

1 0

[1941] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1941 http://trac.macosforge.org/projects/ruby/changeset/1941 Author: vincent.isambart(a)gmail.com Date: 2009-06-26 18:24:26 -0700 (Fri, 26 Jun 2009) Log Message: ----------- fixed a bug in eval Modified Paths: -------------- MacRuby/branches/experimental/parse.y MacRuby/branches/experimental/test_vm/eval.rb Modified: MacRuby/branches/experimental/parse.y =================================================================== --- MacRuby/branches/experimental/parse.y 2009-06-26 23:10:20 UTC (rev 1940) +++ MacRuby/branches/experimental/parse.y 2009-06-27 01:24:26 UTC (rev 1941) @@ -8992,7 +8992,7 @@ pprev_vars = prev_vars->prev; pprev_args = prev_args->prev; - while (pprev_vars != NULL) { + while ((pprev_vars != NULL) && (pprev_vars != DVARS_INHERIT)) { if (vtable_included(pprev_vars, id) || vtable_included(pprev_args, id)) { vtable_add(prev_vars, id); break; Modified: MacRuby/branches/experimental/test_vm/eval.rb =================================================================== --- MacRuby/branches/experimental/test_vm/eval.rb 2009-06-26 23:10:20 UTC (rev 1940) +++ MacRuby/branches/experimental/test_vm/eval.rb 2009-06-27 01:24:26 UTC (rev 1941) @@ -93,3 +93,5 @@ } eval "p a", b } + +assert '42', 'y = eval("proc {|x| p x}"); y.call(42)'

1 0

[1940] MacRuby/branches/experimental/spec/frozen/core/thread
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1940 http://trac.macosforge.org/projects/ruby/changeset/1940 Author: lsansonetti(a)apple.com Date: 2009-06-26 16:10:20 -0700 (Fri, 26 Jun 2009) Log Message: ----------- fixing some specs to use 1.9 and not 1.9.1 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/element_reference_spec.rb MacRuby/branches/experimental/spec/frozen/core/thread/element_set_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/element_reference_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/element_reference_spec.rb 2009-06-26 23:09:59 UTC (rev 1939) +++ MacRuby/branches/experimental/spec/frozen/core/thread/element_reference_spec.rb 2009-06-26 23:10:20 UTC (rev 1940) @@ -37,14 +37,14 @@ t2["value"].should == 2 end - ruby_version_is ""..."1.9.1" do + ruby_version_is ""..."1.9" do it "raises exceptions on the wrong type of keys" do lambda { Thread.current[nil] }.should raise_error(TypeError) lambda { Thread.current[5] }.should raise_error(ArgumentError) end end - ruby_version_is "1.9.1" do + ruby_version_is "1.9" do it "raises exceptions on the wrong type of keys" do lambda { Thread.current[nil] }.should raise_error(TypeError) lambda { Thread.current[5] }.should raise_error(TypeError) Modified: MacRuby/branches/experimental/spec/frozen/core/thread/element_set_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/element_set_spec.rb 2009-06-26 23:09:59 UTC (rev 1939) +++ MacRuby/branches/experimental/spec/frozen/core/thread/element_set_spec.rb 2009-06-26 23:10:20 UTC (rev 1940) @@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/fixtures/classes' describe "Thread#[]=" do - ruby_version_is ""..."1.9.1" do + ruby_version_is ""..."1.9" do it "raises exceptions on the wrong type of keys" do lambda { Thread.current[nil] = true }.should raise_error(TypeError) lambda { Thread.current[5] = true }.should raise_error(ArgumentError) end end - ruby_version_is "1.9.1" do + ruby_version_is "1.9" do it "raises exceptions on the wrong type of keys" do lambda { Thread.current[nil] = true }.should raise_error(TypeError) lambda { Thread.current[5] = true }.should raise_error(TypeError)

1 0

[1939] MacRuby/branches/experimental
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1939 http://trac.macosforge.org/projects/ruby/changeset/1939 Author: lsansonetti(a)apple.com Date: 2009-06-26 16:09:59 -0700 (Fri, 26 Jun 2009) Log Message: ----------- implemented thread locals Modified Paths: -------------- MacRuby/branches/experimental/hash.c MacRuby/branches/experimental/include/ruby/intern.h MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/hash.c =================================================================== --- MacRuby/branches/experimental/hash.c 2009-06-26 22:10:11 UTC (rev 1938) +++ MacRuby/branches/experimental/hash.c 2009-06-26 23:09:59 UTC (rev 1939) @@ -751,14 +751,14 @@ * h #=> {2=>"b", 3=>"c"} */ -static VALUE rb_hash_keys(VALUE, SEL); +static VALUE rb_hash_keys_imp(VALUE, SEL); static VALUE rb_hash_shift(VALUE hash, SEL sel) { VALUE keys, key, val; - keys = rb_hash_keys(hash, 0); + keys = rb_hash_keys_imp(hash, 0); if (RARRAY_LEN(keys) == 0) { struct rb_objc_hash_struct *s = rb_objc_hash_get_struct(hash); @@ -1243,7 +1243,7 @@ */ static VALUE -rb_hash_keys(VALUE hash, SEL sel) +rb_hash_keys_imp(VALUE hash, SEL sel) { VALUE ary; @@ -1253,6 +1253,12 @@ return ary; } +VALUE +rb_hash_keys(VALUE hash) +{ + return rb_hash_keys_imp(hash, 0); +} + static int values_i(VALUE key, VALUE value, VALUE ary) { @@ -1300,12 +1306,17 @@ */ static VALUE -rb_hash_has_key(VALUE hash, SEL sel, VALUE key) +rb_hash_has_key_imp(VALUE hash, SEL sel, VALUE key) { - if (CFDictionaryContainsKey((CFDictionaryRef)hash, (const void *)RB2OC(key))) - return Qtrue; + return CFDictionaryContainsKey((CFDictionaryRef)hash, + (const void *)RB2OC(key)) + ? Qtrue : Qfalse; +} - return Qfalse; +VALUE +rb_hash_has_key(VALUE hash, VALUE key) +{ + return rb_hash_has_key_imp(hash, 0, key); } /* @@ -1426,7 +1437,7 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash) { if (key == Qundef) return ST_CONTINUE; - if (rb_hash_has_key(hash, 0, key)) { + if (rb_hash_has_key_imp(hash, 0, key)) { value = rb_yield_values(3, key, rb_hash_aref(hash, key), value); } rb_hash_aset(hash, key, value); @@ -2364,7 +2375,7 @@ void *keys; static SEL objectEnumerator = 0; PREPARE_RCV(rcv); - keys = (void *)rb_hash_keys((VALUE)rcv, 0); + keys = (void *)rb_hash_keys_imp((VALUE)rcv, 0); RESTORE_RCV(rcv); if (objectEnumerator == 0) objectEnumerator = sel_registerName("objectEnumerator"); @@ -2536,7 +2547,7 @@ rb_objc_define_method(rb_cHash, "each_pair", rb_hash_each_pair, 0); rb_objc_define_method(rb_cHash, "each", rb_hash_each_pair, 0); - rb_objc_define_method(rb_cHash, "keys", rb_hash_keys, 0); + rb_objc_define_method(rb_cHash, "keys", rb_hash_keys_imp, 0); rb_objc_define_method(rb_cHash, "values", rb_hash_values, 0); rb_objc_define_method(rb_cHash, "values_at", rb_hash_values_at, -1); @@ -2560,11 +2571,11 @@ rb_objc_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1); rb_objc_define_method(rb_cHash, "flatten", rb_hash_flatten, -1); - rb_objc_define_method(rb_cHash, "include?", rb_hash_has_key, 1); - rb_objc_define_method(rb_cHash, "member?", rb_hash_has_key, 1); - rb_objc_define_method(rb_cHash, "has_key?", rb_hash_has_key, 1); + rb_objc_define_method(rb_cHash, "include?", rb_hash_has_key_imp, 1); + rb_objc_define_method(rb_cHash, "member?", rb_hash_has_key_imp, 1); + rb_objc_define_method(rb_cHash, "has_key?", rb_hash_has_key_imp, 1); rb_objc_define_method(rb_cHash, "has_value?", rb_hash_has_value, 1); - rb_objc_define_method(rb_cHash, "key?", rb_hash_has_key, 1); + rb_objc_define_method(rb_cHash, "key?", rb_hash_has_key_imp, 1); rb_objc_define_method(rb_cHash, "value?", rb_hash_has_value, 1); rb_objc_define_method(rb_cHash, "compare_by_identity", rb_hash_compare_by_id, 0); Modified: MacRuby/branches/experimental/include/ruby/intern.h =================================================================== --- MacRuby/branches/experimental/include/ruby/intern.h 2009-06-26 22:10:11 UTC (rev 1938) +++ MacRuby/branches/experimental/include/ruby/intern.h 2009-06-26 23:09:59 UTC (rev 1939) @@ -364,6 +364,8 @@ VALUE rb_hash_aset(VALUE, VALUE, VALUE); //VALUE rb_hash_delete_if(VALUE); VALUE rb_hash_delete(VALUE,VALUE); +VALUE rb_hash_has_key(VALUE hash, VALUE key); +VALUE rb_hash_keys(VALUE hash); struct st_table *rb_hash_tbl(VALUE); int rb_path_check(const char*); int rb_env_path_tainted(void); Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-26 22:10:11 UTC (rev 1938) +++ MacRuby/branches/experimental/thread.c 2009-06-26 23:09:59 UTC (rev 1939) @@ -658,9 +658,13 @@ */ static VALUE -rb_thread_aref(VALUE thread, VALUE id) +rb_thread_aref(VALUE thread, SEL sel, VALUE key) { - // TODO + key = ID2SYM(rb_to_id(key)); + VALUE h = rb_vm_thread_locals(thread, false); + if (h != Qnil) { + return rb_hash_aref(h, key); + } return Qnil; } @@ -673,10 +677,10 @@ */ static VALUE -rb_thread_aset(VALUE self, ID id, VALUE val) +rb_thread_aset(VALUE self, SEL sel, ID key, VALUE val) { - // TODO - return Qnil; + key = ID2SYM(rb_to_id(key)); + return rb_hash_aset(rb_vm_thread_locals(self, true), key, val); } /* @@ -693,10 +697,14 @@ */ static VALUE -rb_thread_key_p(VALUE self, VALUE key) +rb_thread_key_p(VALUE self, SEL sel, VALUE key) { - // TODO - return Qnil; + key = ID2SYM(rb_to_id(key)); + VALUE h = rb_vm_thread_locals(self, false); + if (h == Qnil) { + return Qfalse; + } + return rb_hash_has_key(h, key); } int @@ -721,10 +729,10 @@ */ static VALUE -rb_thread_keys(VALUE self) +rb_thread_keys(VALUE self, SEL sel) { - // TODO - return Qnil; + VALUE h = rb_vm_thread_locals(self, false); + return h == Qnil ? rb_ary_new() : rb_hash_keys(h); } /* @@ -1339,10 +1347,10 @@ rb_objc_define_method(rb_cThread, "exit", rb_thread_kill, 0); rb_objc_define_method(rb_cThread, "run", rb_thread_run, 0); rb_objc_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0); - rb_define_method(rb_cThread, "[]", rb_thread_aref, 1); - rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2); - rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1); - rb_define_method(rb_cThread, "keys", rb_thread_keys, 0); + rb_objc_define_method(rb_cThread, "[]", rb_thread_aref, 1); + rb_objc_define_method(rb_cThread, "[]=", rb_thread_aset, 2); + rb_objc_define_method(rb_cThread, "key?", rb_thread_key_p, 1); + rb_objc_define_method(rb_cThread, "keys", rb_thread_keys, 0); rb_define_method(rb_cThread, "priority", rb_thread_priority, 0); rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1); rb_objc_define_method(rb_cThread, "status", rb_thread_status, 0); Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-26 22:10:11 UTC (rev 1938) +++ MacRuby/branches/experimental/vm.cpp 2009-06-26 23:09:59 UTC (rev 1939) @@ -4448,6 +4448,17 @@ } extern "C" +VALUE +rb_vm_thread_locals(VALUE thread, bool create_storage) +{ + rb_vm_thread_t *t = GetThreadPtr(thread); + if (t->locals == Qnil && create_storage) { + GC_WB(&t->locals, rb_hash_new()); + } + return t->locals; +} + +extern "C" void rb_vm_thread_pre_init(rb_vm_thread_t *t, rb_vm_block_t *body, int argc, const VALUE *argv, void *vm) @@ -4476,6 +4487,7 @@ t->vm = vm; t->value = Qundef; + t->locals = Qnil; t->status = THREAD_ALIVE; t->in_cond_wait = false; Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-26 22:10:11 UTC (rev 1938) +++ MacRuby/branches/experimental/vm.h 2009-06-26 23:09:59 UTC (rev 1939) @@ -91,6 +91,7 @@ pthread_cond_t sleep_cond; rb_vm_thread_status_t status; bool in_cond_wait; + VALUE locals; // a Hash object or Qnil } rb_vm_thread_t; typedef struct rb_vm_outer { @@ -343,6 +344,7 @@ VALUE rb_vm_current_thread(void); VALUE rb_vm_main_thread(void); VALUE rb_vm_threads(void); +VALUE rb_vm_thread_locals(VALUE thread, bool create_storage); void rb_vm_thread_wakeup(rb_vm_thread_t *t); void rb_vm_thread_cancel(rb_vm_thread_t *t);

1 0

[1938] MacRuby/branches/experimental
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1938 http://trac.macosforge.org/projects/ruby/changeset/1938 Author: lsansonetti(a)apple.com Date: 2009-06-26 15:10:11 -0700 (Fri, 26 Jun 2009) Log Message: ----------- fixed potential 'signal-before-wait' deadlocks Modified Paths: -------------- MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-26 19:13:14 UTC (rev 1937) +++ MacRuby/branches/experimental/thread.c 2009-06-26 22:10:11 UTC (rev 1938) @@ -83,8 +83,6 @@ rb_sys_fail("pthread_create() failed"); } - //assert(pthread_detach(t->thread) == 0); - return thread; } Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-26 19:13:14 UTC (rev 1937) +++ MacRuby/branches/experimental/vm.cpp 2009-06-26 22:10:11 UTC (rev 1938) @@ -4538,15 +4538,23 @@ post_wait(t); } +static inline void +signal_thread(rb_vm_thread_t *t) +{ + assert(pthread_mutex_lock(&t->sleep_mutex) == 0); + assert(pthread_cond_signal(&t->sleep_cond) == 0); + assert(pthread_mutex_unlock(&t->sleep_mutex) == 0); +} + extern "C" void rb_vm_thread_wakeup(rb_vm_thread_t *t) { if (t->status == THREAD_DEAD) { - rb_raise(rb_eThreadError, "can't wake up thread from the dead"); + rb_raise(rb_eThreadError, "can't wake up thread from the death"); } - if (t->status == THREAD_SLEEP) { - assert(pthread_cond_signal(&t->sleep_cond) == 0); + if (t->status == THREAD_SLEEP && t->in_cond_wait) { + signal_thread(t); } } @@ -4566,7 +4574,7 @@ // will autodestroy itself, to work around a stack unwinding bug // in the Mac OS X pthread implementation that messes our C++ // exception handlers. - assert(pthread_cond_signal(&t->sleep_cond) == 0); + signal_thread(t); } else { assert(pthread_cancel(t->thread) == 0);

1 0

[1937] MacRuby/branches/experimental/spec/frozen
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1937 http://trac.macosforge.org/projects/ruby/changeset/1937 Author: lsansonetti(a)apple.com Date: 2009-06-26 12:13:14 -0700 (Fri, 26 Jun 2009) Log Message: ----------- some work on MT-related specs Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt Modified: MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb 2009-06-26 19:13:14 UTC (rev 1937) @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require File.dirname(__FILE__) + '/fixtures/classes' -ruby_version_is ""..."1.9.1" do +ruby_version_is "" ... "1.9" do describe "Thread.critical=" do before(:each) do ScratchPad.clear Modified: MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb 2009-06-26 19:13:14 UTC (rev 1937) @@ -74,13 +74,15 @@ thread.join ScratchPad.recorded.should == nil end - - it "killing dying sleeping thread wakes up thread" do - t = ThreadSpecs.dying_thread_ensures { Thread.stop; ScratchPad.record :after_stop } - Thread.pass while t.status and t.status != "sleep" - t.send(@method) - t.join - ScratchPad.recorded.should == :after_stop + + ruby_version_is "" ... "1.9" do + it "killing dying sleeping thread wakes up thread" do + t = ThreadSpecs.dying_thread_ensures { Thread.stop; ScratchPad.record :after_stop } + Thread.pass while t.status and t.status != "sleep" + t.send(@method) + t.join + ScratchPad.recorded.should == :after_stop + end end it "killing dying running does nothing" do Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt 2009-06-26 19:13:14 UTC (rev 1937) @@ -1,2 +1 @@ -critical:Kernel#sleep pauses execution indefinitely if not given a duration fails:Kernel#sleep is a private method

1 0

[1936] MacRuby/branches/experimental/thread.c
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1936 http://trac.macosforge.org/projects/ruby/changeset/1936 Author: lsansonetti(a)apple.com Date: 2009-06-26 12:10:59 -0700 (Fri, 26 Jun 2009) Log Message: ----------- don't try to join a dead thread Modified Paths: -------------- MacRuby/branches/experimental/thread.c Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-26 18:52:49 UTC (rev 1935) +++ MacRuby/branches/experimental/thread.c 2009-06-26 19:10:59 UTC (rev 1936) @@ -144,7 +144,9 @@ } rb_vm_thread_t *t = GetThreadPtr(self); - assert(pthread_join(t->thread, NULL) == 0); + if (t->status != THREAD_DEAD) { + assert(pthread_join(t->thread, NULL) == 0); + } return self; }

1 0

[1935] MacRuby/branches/experimental
by source_changes＠macosforge.org 26 Jun '09

26 Jun '09

Revision: 1935 http://trac.macosforge.org/projects/ruby/changeset/1935 Author: lsansonetti(a)apple.com Date: 2009-06-26 11:52:49 -0700 (Fri, 26 Jun 2009) Log Message: ----------- more MT work Modified Paths: -------------- MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-26 13:52:20 UTC (rev 1934) +++ MacRuby/branches/experimental/thread.c 2009-06-26 18:52:49 UTC (rev 1935) @@ -546,7 +546,7 @@ return "sleep"; case THREAD_KILLED: - return "abort"; + return "aborting"; case THREAD_DEAD: return "dead"; @@ -576,7 +576,7 @@ rb_thread_alive_p(VALUE thread, SEL sel) { rb_vm_thread_status_t s = GetThreadPtr(thread)->status; - return s == THREAD_ALIVE || s == THREAD_SLEEP ? Qtrue : Qfalse; + return s != THREAD_DEAD ? Qtrue : Qfalse; } /* Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-26 13:52:20 UTC (rev 1934) +++ MacRuby/branches/experimental/vm.cpp 2009-06-26 18:52:49 UTC (rev 1935) @@ -242,6 +242,69 @@ parse_in_eval = false; } +static inline NODE * +block_cache_key(NODE *node) +{ + if (nd_type(node) == NODE_IFUNC) { + // In this case, node is dynamic but fortunately u1.node is always + // unique (it contains the IMP) + return node->u1.node; + } + return node; +} + +RoxorVM::RoxorVM(const RoxorVM &vm) +{ + current_top_object = vm.current_top_object; + current_class = vm.current_class; + safe_level = vm.safe_level; + + std::vector<rb_vm_block_t *> &vm_blocks = + const_cast<RoxorVM &>(vm).current_blocks; + for (std::vector<rb_vm_block_t *>::iterator i = vm_blocks.begin(); + (i + 1) != vm_blocks.end(); + ++i) { + + const rb_vm_block_t *orig = *i; + rb_vm_block_t *b = NULL; + if (orig != NULL) { +#if 1 + b = const_cast<rb_vm_block_t *>(orig); +#else + // XXX: This code does not work yet, it raises a failed integrity + // check when running the specs. + const size_t block_size = sizeof(rb_vm_block_t *) + + (orig->dvars_size * sizeof(VALUE *)); + + b = (rb_vm_block_t *)xmalloc(block_size); + memcpy(b, orig, block_size); + + GC_WB(&b->self, orig->self); + GC_WB(&b->node, orig->node); + GC_WB(&b->locals, orig->locals); + GC_WB(&b->parent_block, orig->parent_block); // XXX not sure +#endif + rb_objc_retain(b); + NODE *key = block_cache_key(orig->node); + blocks[key] = b; + } + current_blocks.push_back(b); + } + + // TODO bindings, exceptions? + + backref = Qnil; + broken_with = Qundef; + last_status = Qnil; + errinfo = Qnil; + parse_in_eval = false; +} + +RoxorVM::~RoxorVM(void) +{ + // TODO +} + static void append_ptr_address(std::string &s, void *ptr) { @@ -258,10 +321,9 @@ s.append("empty"); } else { - for (std::vector<rb_vm_block_t *>::iterator i = - current_blocks.begin(); - i != current_blocks.end(); - ++i) { + for (std::vector<rb_vm_block_t *>::iterator i = current_blocks.begin(); + i != current_blocks.end(); + ++i) { append_ptr_address(s, *i); s.append(" "); } @@ -2825,7 +2887,7 @@ { assert(src_b->flags & VM_BLOCK_ACTIVE); - int block_size = sizeof(rb_vm_block_t) + const size_t block_size = sizeof(rb_vm_block_t) + (sizeof(VALUE *) * src_b->dvars_size); rb_vm_block_t *new_b = (rb_vm_block_t *)xmalloc(block_size); @@ -2880,19 +2942,10 @@ extern "C" rb_vm_block_t * rb_vm_prepare_block(void *llvm_function, NODE *node, VALUE self, - rb_vm_var_uses **parent_var_uses, - rb_vm_block_t *parent_block, - int dvars_size, ...) + rb_vm_var_uses **parent_var_uses, rb_vm_block_t *parent_block, + int dvars_size, ...) { - NODE *cache_key; - if (nd_type(node) == NODE_IFUNC) { - // In this case, node is dynamic but fortunately u1.node is always - // unique (it contains the IMP) - cache_key = node->u1.node; - } - else { - cache_key = node; - } + NODE *cache_key = block_cache_key(node); bool cached = false; rb_vm_block_t *b = GET_VM()->uncache_or_create_block(cache_key, &cached, @@ -4276,9 +4329,7 @@ { GET_CORE()->set_multithreaded(true); - RoxorVM *vm = new RoxorVM(); - vm->set_current_top_object(GET_VM()->get_current_top_object()); - return (void *)vm; + return (void *)new RoxorVM(*GET_VM()); } void @@ -4352,9 +4403,6 @@ rb_objc_gc_register_thread(); GET_CORE()->register_thread(thread); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); - // Release the thread now. rb_objc_release((void *)thread); @@ -4482,6 +4530,7 @@ } rb_vm_thread_t *t = GET_THREAD(); + pre_wait(t); const int code = pthread_cond_timedwait(&t->sleep_cond, &t->sleep_mutex, &ts); Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-26 13:52:20 UTC (rev 1934) +++ MacRuby/branches/experimental/vm.h 2009-06-26 18:52:49 UTC (rev 1935) @@ -736,6 +736,8 @@ public: RoxorVM(void); + RoxorVM(const RoxorVM &vm); + ~RoxorVM(void); ACCESSOR(thread, VALUE); ACCESSOR(current_class, Class);

1 0