diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-06 06:16:25 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-06 06:16:25 +0000 |
commit | d18b653719687756c82c7c800dee5e91b388fefd (patch) | |
tree | d64ce6d7598471d859d0eb4696a3ba5b49845bd2 /eval.c | |
parent | 1acfb03370704aee624b7a1e5ccf4776f40f2895 (diff) |
merge revision(s) 23432:
* eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts
targets of rest waiting threads to join. [ruby-core:23457]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -11566,6 +11566,16 @@ rb_thread_join(thread, limit) return rb_thread_join0(rb_thread_check(thread), limit); } +void +rb_thread_set_join(thread, join) + VALUE thread, join; +{ + rb_thread_t th = rb_thread_check(thread); + rb_thread_t jth = rb_thread_check(join); + th->wait_for = WAIT_JOIN; + th->join = jth; +} + /* * call-seq: |