summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-24 05:18:47 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-24 05:18:47 +0000
commit242d1879f3105377fe1153a21043bebbbaa7b208 (patch)
tree425980c3ebfb78d38067b3b01f2df97a9dc0853d /eval.c
parent3e278b0745c94b5bba04c680778b21b6a0d785d9 (diff)
downloadruby-242d1879f3105377fe1153a21043bebbbaa7b208.tar.gz
ruby-242d1879f3105377fe1153a21043bebbbaa7b208.tar.xz
ruby-242d1879f3105377fe1153a21043bebbbaa7b208.zip
* eval.c (thgroup_add): no warning for terminated threads.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index f84e5f063..13f9bec54 100644
--- a/eval.c
+++ b/eval.c
@@ -9024,7 +9024,6 @@ rb_thread_kill(thread)
if (th == th->next || th == main_thread) rb_exit(0);
rb_thread_ready(th);
- th->thgroup = 0;
th->status = THREAD_TO_KILL;
if (!rb_thread_critical) rb_thread_schedule();
return thread;
@@ -9965,8 +9964,7 @@ thgroup_add(group, thread)
}
if (!th->thgroup) {
- rb_warn("terminated thread");
- return group;
+ return Qnil;
}
if (OBJ_FROZEN(th->thgroup)) {
rb_raise(rb_eThreadError, "can't move from the frozen thread group");