summaryrefslogtreecommitdiff
path: root/thread_win32.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-16 19:19:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-16 19:19:36 +0000
commit47e3f4e1aed4b71816e05fe608e97c523ea7ccfd (patch)
tree145cbe280c365e3248891cb484b6e12263bef7cd /thread_win32.c
parentaba40d1a3897c56056ffc7ec96957c38b6b9fce8 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@18094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
-rw-r--r--thread_win32.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/thread_win32.c b/thread_win32.c
index 7c31a3f..68d993a 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