diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-23 13:37:59 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-26 21:44:31 +0200 |
commit | dce487912d98835b8168e755b60514f5a8592b27 (patch) | |
tree | 8778547fbb0f2dbb07bb6a83f28d3f4464924141 /cpukit/posix/src/semaphorewaitsupp.c | |
parent | posix: Fix sem_init() with too large initial value (diff) | |
download | rtems-dce487912d98835b8168e755b60514f5a8592b27.tar.bz2 |
score: Add Status_Control for all APIs
Unify the status codes of the Classic and POSIX API to use the new enum
Status_Control. This eliminates the Thread_Control::Wait::timeout_code
field and the timeout parameter of _Thread_queue_Enqueue_critical() and
_MPCI_Send_request_packet(). It gets rid of the status code translation
tables and instead uses simple bit operations to get the status for a
particular API. This enables translation of status code constants at
compile time. Add _Thread_Wait_get_status() to avoid direct access of
thread internal data structures.
Diffstat (limited to 'cpukit/posix/src/semaphorewaitsupp.c')
-rw-r--r-- | cpukit/posix/src/semaphorewaitsupp.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/cpukit/posix/src/semaphorewaitsupp.c b/cpukit/posix/src/semaphorewaitsupp.c index 9382107d90..d8e0d69654 100644 --- a/cpukit/posix/src/semaphorewaitsupp.c +++ b/cpukit/posix/src/semaphorewaitsupp.c @@ -21,6 +21,7 @@ #include <semaphore.h> #include <rtems/posix/semaphoreimpl.h> +#include <rtems/posix/posixapi.h> THREAD_QUEUE_OBJECT_ASSERT( POSIX_Semaphore_Control, Semaphore.Wait_queue ); @@ -31,8 +32,8 @@ int _POSIX_Semaphore_Wait_support( ) { POSIX_Semaphore_Control *the_semaphore; - Thread_Control *executing; Thread_queue_Context queue_context; + Status_Control status; the_semaphore = _POSIX_Semaphore_Get( sem, &queue_context ); @@ -40,23 +41,12 @@ int _POSIX_Semaphore_Wait_support( rtems_set_errno_and_return_minus_one( EINVAL ); } - executing = _Thread_Executing; - - _CORE_semaphore_Seize( + status = _CORE_semaphore_Seize( &the_semaphore->Semaphore, - executing, + _Thread_Executing, blocking, timeout, &queue_context ); - - if ( executing->Wait.return_code == CORE_SEMAPHORE_STATUS_SUCCESSFUL ) { - return 0; - } - - rtems_set_errno_and_return_minus_one( - _POSIX_Semaphore_Translate_core_semaphore_return_code( - executing->Wait.return_code - ) - ); + return _POSIX_Zero_or_minus_one_plus_errno( status ); } |