summaryrefslogtreecommitdiff
path: root/thread_win32.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-09 11:35:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-09 11:35:06 +0000
commit7df7982b47671dff7a84782e57b85df931b39761 (patch)
tree7057ae923812a808b67de7dbafb50aadd96f1039 /thread_win32.c
parenta2ec2f8b592ae36596ab4c1608a5854414a9bd7a (diff)
* thread_{pthread,win32}.c (native_sleep): wait until timed out.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
-rw-r--r--thread_win32.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/thread_win32.c b/thread_win32.c
index a810fb3..54f7546 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -207,9 +207,17 @@ static void
native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
{
int prev_status = th->status;
- DWORD msec;
+ int retry = 0;
+ DWORD msec, ret;
+ struct timeval tvn, limit;
if (tv) {
+ gettimeofday(&limit, NULL);
+ limit.tv_sec += tv->tv_sec;
+ if ((limit.tv_usec += tv->tv_usec) >= 1000000) {
+ limit.tv_sec += limit.tv_usec / 1000000;
+ limit.tv_usec %= 1000000;
+ }
msec = tv->tv_sec * 1000 + tv->tv_usec / 1000;
}
else {
@@ -225,10 +233,9 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
th->status = THREAD_STOPPED;
}
+ sleep_again:
GVL_UNLOCK_BEGIN();
{
- DWORD ret;
-
native_mutex_lock(&th->interrupt_lock);
th->unblock.func = ubf_handle;
th->unblock.arg = th;
@@ -252,6 +259,17 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
th->status = prev_status;
if (!tv && deadlockable) th->vm->sleeper--;
RUBY_VM_CHECK_INTS();
+ if (tv) {
+ gettimeofday(&tvn, NULL);
+ if (limit.tv_sec > tvn.tv_sec ||
+ (limit.tv_sec == tvn.tv_sec && limit.tv_usec > tvn.tv_usec)) {
+ thread_debug("native_sleep: %ld.%.6ld > %ld.%.6ld\n",
+ (long)limit.tv_sec, limit.tv_usec,
+ (long)tvn.tv_sec, tvn.tv_usec);
+ retry = 1;
+ goto sleep_again;
+ }
+ }
}
static int