From bfdf6cde9f0df27814a8cd6a2fc74a7ea584c910 Mon Sep 17 00:00:00 2001 From: normal Date: Sat, 18 Aug 2018 19:03:44 +0000 Subject: [PATCH] Revert "thread.c (sleep_*): check interrupt before changing th->status" This reverts commit 9e59487a38d914275bedcde723923f22b3779e59 (r64449) More (but different) CI failures I can't reproduce locally... http://ci.rvm.jp/results/trunk-test@ruby-sky3/1235951 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thread.c b/thread.c index 075ce31170..8254c7dc0c 100644 --- a/thread.c +++ b/thread.c @@ -1186,8 +1186,8 @@ sleep_forever(rb_thread_t *th, unsigned int fl) int woke; status = fl & SLEEP_DEADLOCKABLE ? THREAD_STOPPED_FOREVER : THREAD_STOPPED; - RUBY_VM_CHECK_INTS_BLOCKING(th->ec); th->status = status; + RUBY_VM_CHECK_INTS_BLOCKING(th->ec); 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); - RUBY_VM_CHECK_INTS_BLOCKING(th->ec); th->status = THREAD_STOPPED; + RUBY_VM_CHECK_INTS_BLOCKING(th->ec); while (th->status == THREAD_STOPPED) { native_sleep(th, &ts); woke = vm_check_ints_blocking(th->ec);