From dce487912d98835b8168e755b60514f5a8592b27 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 23 May 2016 13:37:59 +0200 Subject: 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. --- cpukit/posix/src/pbarrierwait.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'cpukit/posix/src/pbarrierwait.c') diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c index 522c18ec84..0197e46702 100644 --- a/cpukit/posix/src/pbarrierwait.c +++ b/cpukit/posix/src/pbarrierwait.c @@ -19,26 +19,17 @@ #endif #include +#include THREAD_QUEUE_OBJECT_ASSERT( POSIX_Barrier_Control, Barrier.Wait_queue ); -/** - * This directive allows a thread to wait at a barrier. - * - * @param[in] barrier is the barrier id - * - * @retval 0 if successful - * @retval PTHREAD_BARRIER_SERIAL_THREAD if successful - * @retval error_code if unsuccessful - */ - int pthread_barrier_wait( pthread_barrier_t *barrier ) { POSIX_Barrier_Control *the_barrier; Thread_queue_Context queue_context; - Thread_Control *executing; + Status_Control status; if ( barrier == NULL ) { return EINVAL; @@ -50,15 +41,12 @@ int pthread_barrier_wait( return EINVAL; } - executing = _Thread_Executing; - _CORE_barrier_Seize( + status = _CORE_barrier_Seize( &the_barrier->Barrier, - executing, + _Thread_Executing, true, - 0, + WATCHDOG_NO_TIMEOUT, &queue_context ); - return _POSIX_Barrier_Translate_core_barrier_return_code( - executing->Wait.return_code - ); + return _POSIX_Get_error( status ); } -- cgit v1.2.3