diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-19 13:47:57 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-24 10:19:05 +0200 |
| commit | c31058947491ca319c901040219be39e4f8155b6 (patch) | |
| tree | 435bf0887bd77e3d344b31275853a6e52fca8dd8 /cpukit/posix/src/semtimedwait.c | |
| parent | score: Rename function threadq support function (diff) | |
| download | rtems-c31058947491ca319c901040219be39e4f8155b6.tar.bz2 | |
score: Move thread queue timeout handling
Update #3117.
Update #3182.
Diffstat (limited to 'cpukit/posix/src/semtimedwait.c')
| -rw-r--r-- | cpukit/posix/src/semtimedwait.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 90e6866341..9e7bb466dd 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -51,29 +51,16 @@ int sem_timedwait( _Sem_Queue_release( sem, level, &queue_context ); return 0; } else { - Watchdog_Interval ticks; - Status_Control status; - - switch ( _TOD_Absolute_timeout_to_ticks( abstime, CLOCK_REALTIME, &ticks ) ) { - case TOD_ABSOLUTE_TIMEOUT_INVALID: - _Sem_Queue_release( sem, level, &queue_context ); - rtems_set_errno_and_return_minus_one( EINVAL ); - break; - case TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST: - case TOD_ABSOLUTE_TIMEOUT_IS_NOW: - _Sem_Queue_release( sem, level, &queue_context ); - rtems_set_errno_and_return_minus_one( ETIMEDOUT ); - break; - default: - break; - } + Status_Control status; _Thread_queue_Context_set_thread_state( &queue_context, STATES_WAITING_FOR_SEMAPHORE ); - _Thread_queue_Context_set_enqueue_do_nothing_extra( &queue_context ); - _Thread_queue_Context_set_relative_timeout( &queue_context, ticks ); + _Thread_queue_Context_set_enqueue_timeout_realtime_timespec( + &queue_context, + abstime + ); _Thread_queue_Context_set_ISR_level( &queue_context, level ); _Thread_queue_Enqueue( &sem->Queue.Queue, |