diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-05-01 20:52:51 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-05-19 12:00:46 +0200 |
| commit | e76c517d0726f91447e0e2c3ba14c00896456e89 (patch) | |
| tree | caa429239407c3cfa4cfd8a4e68aae25e893ca35 /cpukit/score/include | |
| parent | score: Fine grained locking for message queues (diff) | |
| download | rtems-e76c517d0726f91447e0e2c3ba14c00896456e89.tar.bz2 | |
score: Fine grained locking for semaphores
Update #2273.
Diffstat (limited to 'cpukit/score/include')
| -rw-r--r-- | cpukit/score/include/rtems/score/coresemimpl.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/score/include/rtems/score/coresemimpl.h index 3e1d481ab8..75851ee0d1 100644 --- a/cpukit/score/include/rtems/score/coresemimpl.h +++ b/cpukit/score/include/rtems/score/coresemimpl.h @@ -141,13 +141,16 @@ RTEMS_INLINE_ROUTINE void _CORE_semaphore_Destroy( * with this instance of a SuperCore Semaphore * @param[in] api_semaphore_mp_support is the routine to invoke if the * thread unblocked is remote + * @param[in] lock_context is a temporary variable used to contain the ISR + * disable level cookie * * @retval an indication of whether the routine succeeded or failed */ CORE_semaphore_Status _CORE_semaphore_Surrender( CORE_semaphore_Control *the_semaphore, Objects_Id id, - CORE_semaphore_API_mp_support_callout api_semaphore_mp_support + CORE_semaphore_API_mp_support_callout api_semaphore_mp_support, + ISR_lock_Context *lock_context ); /** @@ -228,21 +231,20 @@ RTEMS_INLINE_ROUTINE void _CORE_semaphore_Seize_isr_disable( /* disabled when you get here */ executing->Wait.return_code = CORE_SEMAPHORE_STATUS_SUCCESSFUL; + _Thread_queue_Acquire_critical( &the_semaphore->Wait_queue, lock_context ); if ( the_semaphore->count != 0 ) { the_semaphore->count -= 1; - _ISR_lock_ISR_enable( lock_context ); + _Thread_queue_Release( &the_semaphore->Wait_queue, lock_context ); return; } if ( !wait ) { - _ISR_lock_ISR_enable( lock_context ); + _Thread_queue_Release( &the_semaphore->Wait_queue, lock_context ); executing->Wait.return_code = CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT; return; } - _Thread_Disable_dispatch(); executing->Wait.id = id; - _Thread_queue_Acquire_critical( &the_semaphore->Wait_queue, lock_context ); _Thread_queue_Enqueue_critical( &the_semaphore->Wait_queue, executing, @@ -251,7 +253,6 @@ RTEMS_INLINE_ROUTINE void _CORE_semaphore_Seize_isr_disable( CORE_SEMAPHORE_TIMEOUT, lock_context ); - _Thread_Enable_dispatch(); } /** @} */ |