Permalink
Browse files

* thread_win32.c (native_sleep): fixed previous commit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
unak committed Jun 12, 2008
1 parent 6f5aaff commit 4b022866eec600f3ed03ed57d5f7b05f09946b10
Showing with 10 additions and 4 deletions.
  1. +4 −0 ChangeLog
  2. +6 −4 thread_win32.c
View
@@ -1,3 +1,7 @@
+Thu Jun 12 22:19:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (native_sleep): fixed previous commit.
+
Thu Jun 12 21:59:17 2008 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c, vm_core.h, vm.c, thread_pthread.c, thread_win32.c: add
View
@@ -147,7 +147,7 @@ rb_w32_wait_events(HANDLE *events, int num, DWORD timeout)
int ret;
BLOCKING_REGION(ret = rb_w32_wait_events_blocking(events, num, timeout),
- ubf_handle, GET_THREAD());
+ ubf_handle, GET_THREAD(), 1);
return ret;
}
@@ -199,14 +199,16 @@ rb_w32_Sleep(unsigned long msec)
int ret;
BLOCKING_REGION(ret = rb_w32_sleep(msec),
- ubf_handle, GET_THREAD());
+ ubf_handle, GET_THREAD(), 1);
return ret;
}
static void
native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
{
+ int prev_status = th->status;
DWORD msec;
+
if (tv) {
msec = tv->tv_sec * 1000 + tv->tv_usec / 1000;
}
@@ -222,10 +224,10 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
else {
th->status = THREAD_STOPPED;
}
+
GVL_UNLOCK_BEGIN();
{
DWORD ret;
- int status = th->status;
th->unblock.func = ubf_handle;
th->unblock.arg = th;
@@ -243,7 +245,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
th->unblock.arg = 0;
}
GVL_UNLOCK_END();
- th->status = status;
+ th->status = prev_status;
if (!tv && deadlockable) th->vm->sleeper++;
RUBY_VM_CHECK_INTS();
}

0 comments on commit 4b02286

Please sign in to comment.