diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-18 18:29:28 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-18 18:29:28 +0000 |
| commit | 9e59487a38d914275bedcde723923f22b3779e59 (patch) | |
| tree | 6f0ee5edcd40e00263c4a6c3ed455f1425b744d0 /thread.c | |
| parent | c742050ea5fd30108f913383c0fafc4614adb04c (diff) | |
thread.c (sleep_*): check interrupt before changing th->status
Having threads switch before we sleep can cause applications
to misread the state of the thread. Now, we are consistent
with blocking_region_begin behavior and change th->status
AFTER checking interrupts.
Maybe this can fix [Bug #15002]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
| -rw-r--r-- | thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1186,8 +1186,8 @@ sleep_forever(rb_thread_t *th, unsigned int fl) int woke; status = fl & SLEEP_DEADLOCKABLE ? THREAD_STOPPED_FOREVER : THREAD_STOPPED; - th->status = status; RUBY_VM_CHECK_INTS_BLOCKING(th->ec); + th->status = status; while (th->status == status) { if (fl & SLEEP_DEADLOCKABLE) { th->vm->sleeper++; @@ -1292,8 +1292,8 @@ sleep_timespec(rb_thread_t *th, struct timespec ts, unsigned int fl) getclockofday(&end); timespec_add(&end, &ts); - th->status = THREAD_STOPPED; RUBY_VM_CHECK_INTS_BLOCKING(th->ec); + th->status = THREAD_STOPPED; while (th->status == THREAD_STOPPED) { native_sleep(th, &ts); woke = vm_check_ints_blocking(th->ec); |