diff options
Diffstat (limited to 'libpipe')
| -rw-r--r-- | libpipe/pipe.c | 16 | ||||
| -rw-r--r-- | libpipe/pipe.h | 34 |
2 files changed, 34 insertions, 16 deletions
diff --git a/libpipe/pipe.c b/libpipe/pipe.c index dd306f60..1ddaf126 100644 --- a/libpipe/pipe.c +++ b/libpipe/pipe.c @@ -209,7 +209,7 @@ void _pipe_no_writers (struct pipe *pipe) this function (unlike most pipe functions). */ error_t pipe_pair_select (struct pipe *rpipe, struct pipe *wpipe, - int *select_type, int data_only) + struct timespec *tsp, int *select_type, int data_only) { error_t err = 0; @@ -218,13 +218,13 @@ pipe_pair_select (struct pipe *rpipe, struct pipe *wpipe, if (*select_type == SELECT_READ) { pthread_mutex_lock (&rpipe->lock); - err = pipe_select_readable (rpipe, data_only); + err = pipe_select_readable (rpipe, tsp, data_only); pthread_mutex_unlock (&rpipe->lock); } else if (*select_type == SELECT_WRITE) { pthread_mutex_lock (&wpipe->lock); - err = pipe_select_writable (wpipe); + err = pipe_select_writable (wpipe, tsp); pthread_mutex_unlock (&wpipe->lock); } else @@ -260,8 +260,8 @@ pipe_pair_select (struct pipe *rpipe, struct pipe *wpipe, pthread_mutex_unlock (&rpipe->lock); pthread_mutex_unlock (&wpipe->lock); } - if (pthread_hurd_cond_wait_np (&pending_select.cond, lock)) - err = EINTR; + err = pthread_hurd_cond_timedwait_np (&pending_select.cond, lock, + tsp); if (rpipe != wpipe) { pthread_mutex_lock (&rpipe->lock); @@ -295,6 +295,12 @@ pipe_pair_select (struct pipe *rpipe, struct pipe *wpipe, pthread_mutex_unlock (lock); } + if (err == ETIMEDOUT) + { + err = 0; + *select_type = 0; + } + return err; } diff --git a/libpipe/pipe.h b/libpipe/pipe.h index b8e70681..040204d5 100644 --- a/libpipe/pipe.h +++ b/libpipe/pipe.h @@ -126,11 +126,12 @@ extern int pipe_is_readable (struct pipe *pipe, int data_only); extern error_t pipe_wait_readable (struct pipe *pipe, int noblock, int data_only); -extern error_t pipe_select_readable (struct pipe *pipe, int data_only); +extern error_t pipe_select_readable (struct pipe *pipe, struct timespec *tsp, + int data_only); extern error_t pipe_wait_writable (struct pipe *pipe, int noblock); -extern error_t pipe_select_writable (struct pipe *pipe); +extern error_t pipe_select_writable (struct pipe *pipe, struct timespec *tsp); #if defined(__USE_EXTERN_INLINES) || defined(PIPE_DEFINE_EI) @@ -188,12 +189,17 @@ pipe_wait_readable (struct pipe *pipe, int noblock, int data_only) given a chance to read, and if there is still data available thereafter. If DATA_ONLY is true, then `control' packets are ignored. */ PIPE_EI error_t -pipe_select_readable (struct pipe *pipe, int data_only) +pipe_select_readable (struct pipe *pipe, struct timespec *tsp, int data_only) { + error_t err = 0; while (! pipe_is_readable (pipe, data_only) && ! (pipe->flags & PIPE_BROKEN)) - if (pthread_hurd_cond_wait_np (&pipe->pending_read_selects, &pipe->lock)) - return EINTR; - return 0; + { + err = pthread_hurd_cond_timedwait_np (&pipe->pending_read_selects, + &pipe->lock, tsp); + if (err) + break; + } + return err; } /* Block until data can be written to PIPE. If NOBLOCK is true, then @@ -221,13 +227,18 @@ pipe_wait_writable (struct pipe *pipe, int noblock) threads waiting using pipe_wait_writable have been woken and given a chance to write, and if there is still space available thereafter. */ PIPE_EI error_t -pipe_select_writable (struct pipe *pipe) +pipe_select_writable (struct pipe *pipe, struct timespec *tsp) { size_t limit = pipe->write_limit; + error_t err = 0; while (! (pipe->flags & PIPE_BROKEN) && pipe_readable (pipe, 1) >= limit) - if (pthread_hurd_cond_wait_np (&pipe->pending_writes, &pipe->lock)) - return EINTR; - return 0; + { + err = pthread_hurd_cond_timedwait_np (&pipe->pending_writes, + &pipe->lock, tsp); + if (err) + break; + } + return err; } #endif /* Use extern inlines. */ @@ -419,7 +430,8 @@ extern pthread_mutex_t pipe_multiple_lock; waited for on RPIPE. Neither RPIPE or WPIPE should be locked when calling this function (unlike most pipe functions). */ error_t pipe_pair_select (struct pipe *rpipe, struct pipe *wpipe, - int *select_type, int data_only); + struct timespec *tsp, int *select_type, + int data_only); /* ---------------------------------------------------------------- */ /* User-provided functions. */ |