From 677bfb0881c56dad767a07b31ac543db284e16c6 Mon Sep 17 00:00:00 2001 From: rpj Date: Thu, 14 Jan 1999 22:33:54 +0000 Subject: Fri Jan 15 15:41:28 1999 Ross Johnson * pthread.h: Add new 'abstime' arg to pthreadCancelableWait() prototype. * condvar.c (cond_timedwait): New generalised function called by both pthread_cond_wait() and pthread_cond_timedwait(). This is essentially pthread_cond_wait() renamed and modified to add the 'abstime' arg and call the new _pthread_sem_timedwait() instead of sem_wait(). (pthread_cond_wait): Now just calls the internal static function cond_timedwait() with an INFINITE wait. (pthread_cond_timedwait): Now implemented. Calls the internal static function cond_timedwait(). * implement.h (_pthread_sem_timedwait): New internal function prototype. * misc.c (pthreadCancelableWait): Added new 'abstime' argument to allow shorter than INFINITE wait. * semaphore.c (_pthread_sem_timedwait): New function for internal use. This is essentially sem_wait() modified to add the 'abstime' arg and call the modified (see above) pthreadCancelableWait(). --- misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index f49cd51..d6c4b2f 100644 --- a/misc.c +++ b/misc.c @@ -130,7 +130,7 @@ pthread_equal (pthread_t t1, pthread_t t2) int -pthreadCancelableWait (HANDLE waitHandle) +pthreadCancelableWait (HANDLE waitHandle, DWORD abstime) /* * ------------------------------------------------------------------- * This provides an extra hook into the pthread_cancel @@ -177,7 +177,7 @@ pthreadCancelableWait (HANDLE waitHandle) nHandles, handles, FALSE, - INFINITE); + abstime); if (status == WAIT_FAILED) @@ -187,7 +187,7 @@ pthreadCancelableWait (HANDLE waitHandle) } else if (status == WAIT_ABANDONED_0) { - result = EINVAL; + result = ETIMEDOUT; } else -- cgit v1.2.3