diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | bootstraptest/test_fork.rb | 6 | ||||
-rw-r--r-- | bootstraptest/test_knownbug.rb | 7 | ||||
-rw-r--r-- | thread.c | 3 |
4 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +Fri Dec 21 17:25:22 2007 Koichi Sasada <ko1@atdot.net> + + * thread.c (rb_thread_atfork): fix to mark thread object. + [ruby-dev:32404] + + * bootstraptest/test_knownbug.rb, test_fork.rb: move a fixed test. + Fri Dec 21 17:07:13 2007 Koichi Sasada <ko1@atdot.net> * gc.h: extern variable should not be initialized. diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb new file mode 100644 index 0000000000..4632ca2694 --- /dev/null +++ b/bootstraptest/test_fork.rb @@ -0,0 +1,6 @@ +assert_equal '0', %q{
+ GC.stress = true
+ pid = fork {}
+ Process.wait pid
+ $?.to_i
+}, '[ruby-dev:32404]'
diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb index d52d86e6dc..8b53798c28 100644 --- a/bootstraptest/test_knownbug.rb +++ b/bootstraptest/test_knownbug.rb @@ -3,13 +3,6 @@ # So all tests will cause failure. # -assert_equal '0', %q{ - GC.stress = true - pid = fork {} - Process.wait pid - $?.to_i -}, '[ruby-dev:32404]' - assert_equal 'ok', %q{ 1.times{ eval("break") @@ -1974,11 +1974,12 @@ rb_thread_atfork(void) { rb_thread_t *th = GET_THREAD(); rb_vm_t *vm = th->vm; + volatile VALUE thval = th->self; vm->main_thread = th; st_free_table(vm->living_threads); vm->living_threads = st_init_numtable(); - st_insert(vm->living_threads, th->self, (st_data_t) th->thread_id); + st_insert(vm->living_threads, thval, (st_data_t) th->thread_id); } struct thgroup { |