From c61e84fd7b226ec29ff86e16f889a7c82f89b58d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 16 Jul 2008 19:19:36 +0000 Subject: * thread.c (thread_start_func_2): wake up joining threads. * thread.c (sleep_forever, sleep_timeval): return when interrupted. [ruby-dev:35542] * thread.c (timer_thread_function): restore main thread status. [ruby-core:17270] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread_win32.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'thread_win32.c') diff --git a/thread_win32.c b/thread_win32.c index 7c31a3f70..68d993a0b 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -204,9 +204,8 @@ rb_w32_Sleep(unsigned long msec) } static void -native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) +native_sleep(rb_thread_t *th, struct timeval *tv) { - int prev_status = th->status; DWORD msec; if (tv) { @@ -216,15 +215,6 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) msec = INFINITE; } - if (!tv && deadlockable) { - th->status = THREAD_STOPPED_FOREVER; - th->vm->sleeper++; - rb_check_deadlock(th->vm); - } - else { - th->status = THREAD_STOPPED; - } - GVL_UNLOCK_BEGIN(); { DWORD ret; @@ -249,9 +239,6 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) native_mutex_unlock(&th->interrupt_lock); } GVL_UNLOCK_END(); - th->status = prev_status; - if (!tv && deadlockable) th->vm->sleeper--; - RUBY_VM_CHECK_INTS(); } static int -- cgit