kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* thread.c (sleep_forever): wait until timed out. [ruby-core:17270]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-09 13:41:19 +00:00
parent 6372357ad5
commit a14682906f
4 changed files with 48 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

17
thread_pthread.c
View file

@ -496,7 +496,6 @@ 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;
@ -520,7 +519,6 @@ 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);
@ -532,7 +530,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
thread_debug("native_sleep: interrupted before sleep\n");
}
else {
if (tv == 0 || (!retry && ts.tv_sec < tvn.tv_sec /* overflow */)) {
if (tv == 0 || 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,
@ -542,7 +540,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
}
else {
int r;
thread_debug("native_sleep: pthread_cond_timedwait start (%ld.%.9ld)\n",
thread_debug("native_sleep: pthread_cond_timedwait start (%ld, %ld)\n",
(unsigned long)ts.tv_sec, ts.tv_nsec);
r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond,
&th->interrupt_lock, &ts);
@ -560,17 +558,6 @@ 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");
}