diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-09-01 14:46:02 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-09-01 14:46:02 +0000 |
| commit | 3c838f1ac8ffd824969a90547d38ab7f6f10859b (patch) | |
| tree | 3fdd2989c44023258b217af7d5cb8c823316b296 | |
| parent | 2005-09-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-3c838f1ac8ffd824969a90547d38ab7f6f10859b.tar.bz2 | |
2005-09-01 Joel Sherrill <joel@OARcorp.com>
PR 796/rtems
* src/semtimedwait.c: sem_timedwait is supposed to use absolute time
for timeout specification. This patch is a modified version of the
one suggested by Peter Dufault.
| -rw-r--r-- | cpukit/posix/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/posix/src/semtimedwait.c | 40 |
2 files changed, 41 insertions, 6 deletions
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog index 71af722495..87562e4434 100644 --- a/cpukit/posix/ChangeLog +++ b/cpukit/posix/ChangeLog @@ -1,3 +1,10 @@ +2005-09-01 Joel Sherrill <joel@OARcorp.com> + + PR 796/rtems + * src/semtimedwait.c: sem_timedwait is supposed to use absolute time + for timeout specification. This patch is a modified version of the + one suggested by Peter Dufault. + 2005-08-17 Nuno Costa <nuno-costa@iol.pt> PR 805/rtems diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index f5904c59fd..6acb704f7c 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -29,12 +29,40 @@ int sem_timedwait( sem_t *sem, - const struct timespec *timeout + const struct timespec *abstime ) { - return _POSIX_Semaphore_Wait_support( - sem, - TRUE, - _POSIX_Timespec_to_interval( timeout ) - ); + /* + * The abstime is a walltime. We turn it into an interval. + */ + Watchdog_Interval ticks; + struct timespec current_time; + struct timespec difference; + + /* + * Error check the absolute time to timeout + */ + if ( /* abstime->tv_sec < 0 || */ abstime->tv_nsec ) /* tv_sec is unsigned */ + return EINVAL; + + if ( abstime->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) + return EINVAL; + + (void) clock_gettime( CLOCK_REALTIME, ¤t_time ); + + /* + * Make sure the abstime is in the future + */ + if ( abstime->tv_sec < current_time.tv_sec ) + return EINVAL; + if ( (abstime->tv_sec == current_time.tv_sec) && + (abstime->tv_nsec <= current_time.tv_nsec) ) + return EINVAL; + + _POSIX_Timespec_subtract( ¤t_time, abstime, &difference ); + + ticks = _POSIX_Timespec_to_interval( &difference ); + + return _POSIX_Semaphore_Wait_support( sem, TRUE, ticks ); } + |