From f488df6c994e9b1a8827ed7d4188574f09c815fb Mon Sep 17 00:00:00 2001 From: mtm Date: Thu, 29 Jan 2004 09:44:36 +0000 Subject: When suspending a thread if the timeout was very short or the system call got interrupted and the absolute timeout is converted to a relative timeout, it may happen that we get a negative number. In such a case, simply set the timeout to zero so that if the event that the thread wants to wait for has happened it can still return successfully, but if it hasn't happened then the thread doesn't suspend indefinitely. This should fix certain applications (including mozilla) that seem to hang indefinitely sometimes. Noticed and debugged by: Morten Johansen --- lib/libthr/thread/thr_kern.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/libthr/thread/thr_kern.c') diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c index 3584246..1073ffd 100644 --- a/lib/libthr/thread/thr_kern.c +++ b/lib/libthr/thread/thr_kern.c @@ -137,6 +137,17 @@ _thread_suspend(pthread_t pthread, const struct timespec *abstime) remaining = *abstime; timespecsub(&remaining, &now); ts = &remaining; + + /* + * If the absolute timeout has already passed set the + * relative timeout to 0 sec. so that sigtimedwait() + * returns immediately. + * NOTE: timespecsub() makes sure the tv_nsec member >= 0. + */ + if (ts->tv_sec < 0) { + ts->tv_sec = 0; + ts->tv_nsec = 0; + } } else ts = NULL; -- cgit v1.1