diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-09 11:35:06 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-09 11:35:06 +0000 |
commit | 7df7982b47671dff7a84782e57b85df931b39761 (patch) | |
tree | 7057ae923812a808b67de7dbafb50aadd96f1039 /thread_pthread.c | |
parent | a2ec2f8b592ae36596ab4c1608a5854414a9bd7a (diff) | |
download | ruby-7df7982b47671dff7a84782e57b85df931b39761.tar.gz |
* 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_pthread.c')
-rw-r--r-- | thread_pthread.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 4787823b3d..c6aca1d464 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -496,6 +496,7 @@ static void native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) { int prev_status = th->status; + int retry = 0; struct timespec ts; struct timeval tvn; @@ -519,6 +520,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) } thread_debug("native_sleep %ld\n", tv ? tv->tv_sec : -1); + sleep_again: GVL_UNLOCK_BEGIN(); { pthread_mutex_lock(&th->interrupt_lock); @@ -530,7 +532,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) thread_debug("native_sleep: interrupted before sleep\n"); } else { - if (tv == 0 || ts.tv_sec < tvn.tv_sec /* overflow */ ) { + if (tv == 0 || (!retry && ts.tv_sec < tvn.tv_sec /* overflow */)) { int r; thread_debug("native_sleep: pthread_cond_wait start\n"); r = pthread_cond_wait(&th->native_thread_data.sleep_cond, @@ -540,7 +542,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) } else { int r; - thread_debug("native_sleep: pthread_cond_timedwait start (%ld, %ld)\n", + thread_debug("native_sleep: pthread_cond_timedwait start (%ld.%.9ld)\n", (unsigned long)ts.tv_sec, ts.tv_nsec); r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond, &th->interrupt_lock, &ts); @@ -558,6 +560,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 (ts.tv_sec > tvn.tv_sec || + (ts.tv_sec == tvn.tv_sec && ts.tv_nsec > tvn.tv_usec * 1000)) { + thread_debug("native_sleep: %ld.%.9ld > %ld.%.6ld\n", + (long)ts.tv_sec, ts.tv_nsec, + (long)tvn.tv_sec, tvn.tv_usec); + retry = 1; + goto sleep_again; + } + } thread_debug("native_sleep done\n"); } |