diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-25 14:28:56 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-25 14:28:56 +0000 |
commit | fb72e453f9e141f182a542dc03b6d95267a3737f (patch) | |
tree | ce04df62f314bb9e4de4fbbe28309d5e9281ff0c | |
parent | 1a196574c4bd7867cd30f48d057680e5a1ab3364 (diff) | |
download | ruby-fb72e453f9e141f182a542dc03b6d95267a3737f.tar.gz |
* thread.c (sleep_forever): now Kernel#sleep don't wakeup by
signal handler execution. [Bug #4072]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Jun 25 23:23:14 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * thread.c (sleep_forever): now Kernel#sleep don't wakeup by + signal handler execution. [Bug #4072] + Sat Jun 25 23:14:47 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * thread.c (rb_threadptr_check_signal): remove unnecessary th->status @@ -834,8 +834,9 @@ static void sleep_forever(rb_thread_t *th, int deadlockable) { enum rb_thread_status prev_status = th->status; + enum rb_thread_status status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED; - th->status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED; + th->status = status; do { if (deadlockable) { th->vm->sleeper++; @@ -846,7 +847,7 @@ sleep_forever(rb_thread_t *th, int deadlockable) th->vm->sleeper--; } RUBY_VM_CHECK_INTS(); - } while (th->status == THREAD_STOPPED_FOREVER); + } while (th->status == status); th->status = prev_status; } |