* eval.c (rb_thread_remove): thread may die in the process of

  rb_thread_die().  this change was suggested by Rudi Cilibrasi
  <[email protected]>.

* eval.c (rb_thread_start_0): main thread swapped by fork() may
  terminate rb_thread_start_0() successfully. call ruby_stop(0);
  this change too was suggested by Rudi.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 37923ecdea..4c5c0b55bf 100644
--- a/eval.c
+++ b/eval.c
@@ -7980,6 +7980,7 @@ rb_thread_remove(th)
 
     rb_thread_ready(th);
     rb_thread_die(th);
+    if (th->status == THREAD_KILLED) return; /* died in process */
     th->prev->next = th->next;
     th->next->prev = th->prev;
 }
@@ -9004,6 +9005,7 @@ rb_thread_start_0(fn, arg, th_arg)
 	}
     }
     rb_thread_schedule();
+    ruby_stop(0);		/* last thread termination */
     return 0;			/* not reached */
 }