diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-23 11:40:18 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 12:43:54 +0200 |
| commit | 631b3c8967a329cdd53e54365e4e4c0aa93a4251 (patch) | |
| tree | 3a750b145a90c90aa86222c26ee68aeb8c87a417 /cpukit/score/include/rtems/score/corerwlockimpl.h | |
| parent | score: Get rid of mp_id parameter (diff) | |
| download | rtems-631b3c8967a329cdd53e54365e4e4c0aa93a4251.tar.bz2 | |
score: Move thread queue MP callout to context
Drop the multiprocessing (MP) dependent callout parameter from the
thread queue extract, dequeue, flush and unblock methods. Merge this
parameter with the lock context into new structure Thread_queue_Context.
This helps to gets rid of the conditionally compiled method call
helpers.
Diffstat (limited to 'cpukit/score/include/rtems/score/corerwlockimpl.h')
| -rw-r--r-- | cpukit/score/include/rtems/score/corerwlockimpl.h | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/cpukit/score/include/rtems/score/corerwlockimpl.h b/cpukit/score/include/rtems/score/corerwlockimpl.h index ed59d696b6..67084c136a 100644 --- a/cpukit/score/include/rtems/score/corerwlockimpl.h +++ b/cpukit/score/include/rtems/score/corerwlockimpl.h @@ -87,19 +87,25 @@ RTEMS_INLINE_ROUTINE void _CORE_RWLock_Destroy( } RTEMS_INLINE_ROUTINE void _CORE_RWLock_Acquire_critical( - CORE_RWLock_Control *the_rwlock, - ISR_lock_Context *lock_context + CORE_RWLock_Control *the_rwlock, + Thread_queue_Context *queue_context ) { - _Thread_queue_Acquire_critical( &the_rwlock->Wait_queue, lock_context ); + _Thread_queue_Acquire_critical( + &the_rwlock->Wait_queue, + &queue_context->Lock_context + ); } RTEMS_INLINE_ROUTINE void _CORE_RWLock_Release( - CORE_RWLock_Control *the_rwlock, - ISR_lock_Context *lock_context + CORE_RWLock_Control *the_rwlock, + Thread_queue_Context *queue_context ) { - _Thread_queue_Release( &the_rwlock->Wait_queue, lock_context ); + _Thread_queue_Release( + &the_rwlock->Wait_queue, + &queue_context->Lock_context + ); } /** @@ -116,11 +122,11 @@ RTEMS_INLINE_ROUTINE void _CORE_RWLock_Release( */ void _CORE_RWLock_Seize_for_reading( - CORE_RWLock_Control *the_rwlock, - Thread_Control *executing, - bool wait, - Watchdog_Interval timeout, - ISR_lock_Context *lock_context + CORE_RWLock_Control *the_rwlock, + Thread_Control *executing, + bool wait, + Watchdog_Interval timeout, + Thread_queue_Context *queue_context ); /** @@ -136,11 +142,11 @@ void _CORE_RWLock_Seize_for_reading( * @note Status is returned via the thread control block. */ void _CORE_RWLock_Seize_for_writing( - CORE_RWLock_Control *the_rwlock, - Thread_Control *executing, - bool wait, - Watchdog_Interval timeout, - ISR_lock_Context *lock_context + CORE_RWLock_Control *the_rwlock, + Thread_Control *executing, + bool wait, + Watchdog_Interval timeout, + Thread_queue_Context *queue_context ); /** @@ -154,8 +160,8 @@ void _CORE_RWLock_Seize_for_writing( * @retval Status is returned to indicate successful or failure. */ CORE_RWLock_Status _CORE_RWLock_Surrender( - CORE_RWLock_Control *the_rwlock, - ISR_lock_Context *lock_context + CORE_RWLock_Control *the_rwlock, + Thread_queue_Context *queue_context ); /** @} */ |