From 0c72a8f091eff82b71e045fc8049406d0a48ee85 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 11 Mar 2017 18:45:34 +0000 Subject: merge revision(s) 57477,57478,57479: [Backport #12405] use TRUE/FALSE. define rb_thread_sleep_deadly_allow_spurious_wakeup(). * thread.c, thread_sync.c: define new function rb_thread_sleep_deadly_allow_spurious_wakeup() and use it instead of using sleep_forever() directly. allow Queue operation in trap. * thread_sync.c: allow spurious wakeup to check Queue status just after trap. [Bug #12405] * test/thread/test_queue.rb: add a test for it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread_sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'thread_sync.c') diff --git a/thread_sync.c b/thread_sync.c index 8869af2deb..152995fac0 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -420,7 +420,7 @@ rb_mutex_abandon_all(rb_mutex_t *mutexes) static VALUE rb_mutex_sleep_forever(VALUE time) { - sleep_forever(GET_THREAD(), 1, 0); /* permit spurious check */ + rb_thread_sleep_deadly_allow_spurious_wakeup(); return Qnil; } @@ -773,7 +773,7 @@ queue_delete_from_waiting(struct waiting_delete *p) static VALUE queue_sleep(VALUE arg) { - rb_thread_sleep_deadly(); + rb_thread_sleep_deadly_allow_spurious_wakeup(); return Qnil; } -- cgit v1.2.3