diff options
| author | rpj <rpj> | 1999-01-14 22:33:54 +0000 |
|---|---|---|
| committer | rpj <rpj> | 1999-01-14 22:33:54 +0000 |
| commit | 677bfb0881c56dad767a07b31ac543db284e16c6 (patch) | |
| tree | 1a25c36c4291cb435b1196ffad2ae80f31829ce7 /misc.c | |
| parent | d0b36781d64a52a93ffec89d7b89a243793ea835 (diff) | |
Fri Jan 15 15:41:28 1999 Ross Johnson <rpj@swan.canberra.edu.au>
* 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().
Diffstat (limited to 'misc.c')
| -rw-r--r-- | misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |