RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rtems: Avoid Giant lock in rtems_signal_catch()

Browse Source 
Update #2555.
This commit is contained in:
Sebastian Huber
2016-03-17 06:51:56 +01:00
parent f5bb299190
commit 92dee4ab9c
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cpukit/rtems/include/rtems/rtems/asrimpl.h
View File

@@ -59,6 +59,22 @@ RTEMS_INLINE_ROUTINE void _ASR_Destroy( ASR_Information *asr )
_ISR_lock_Destroy( &asr->Lock ); _ISR_lock_Destroy( &asr->Lock );
} }
RTEMS_INLINE_ROUTINE void _ASR_Acquire(
ASR_Information *asr,
ISR_lock_Context *lock_context
)
{
_ISR_lock_ISR_disable_and_acquire( &asr->Lock, lock_context );
}
RTEMS_INLINE_ROUTINE void _ASR_Release(
ASR_Information *asr,
ISR_lock_Context *lock_context
)
{
_ISR_lock_Release_and_ISR_enable( &asr->Lock, lock_context );
}
/** /**
* @brief ASR_Swap_signals * @brief ASR_Swap_signals
* *
@@ -73,11 +89,11 @@ RTEMS_INLINE_ROUTINE void _ASR_Swap_signals (
rtems_signal_set _signals; rtems_signal_set _signals;
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
_ISR_lock_ISR_disable_and_acquire( &asr->Lock, &lock_context ); _ASR_Acquire( asr, &lock_context );
_signals = asr->signals_pending; _signals = asr->signals_pending;
asr->signals_pending = asr->signals_posted; asr->signals_pending = asr->signals_posted;
asr->signals_posted = _signals; asr->signals_posted = _signals;
_ISR_lock_Release_and_ISR_enable( &asr->Lock, &lock_context ); _ASR_Release( asr, &lock_context );
} }
/** /**
@@ -122,9 +138,9 @@ RTEMS_INLINE_ROUTINE void _ASR_Post_signals(
{ {
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
_ISR_lock_ISR_disable_and_acquire( &asr->Lock, &lock_context ); _ASR_Acquire( asr, &lock_context );
*signal_set |= signals; *signal_set |= signals;
_ISR_lock_Release_and_ISR_enable( &asr->Lock, &lock_context ); _ASR_Release( asr, &lock_context );
} }
RTEMS_INLINE_ROUTINE rtems_signal_set _ASR_Get_posted_signals( RTEMS_INLINE_ROUTINE rtems_signal_set _ASR_Get_posted_signals(
@@ -134,10 +150,10 @@ RTEMS_INLINE_ROUTINE rtems_signal_set _ASR_Get_posted_signals(
rtems_signal_set signal_set; rtems_signal_set signal_set;
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
_ISR_lock_ISR_disable_and_acquire( &asr->Lock, &lock_context ); _ASR_Acquire( asr, &lock_context );
signal_set = asr->signals_posted; signal_set = asr->signals_posted;
asr->signals_posted = 0; asr->signals_posted = 0;
_ISR_lock_Release_and_ISR_enable( &asr->Lock, &lock_context ); _ASR_Release( asr, &lock_context );
return signal_set; return signal_set;
} }

11
cpukit/rtems/src/signalcatch.c
View File

@@ -72,21 +72,22 @@ rtems_status_code rtems_signal_catch(
Thread_Control *executing; Thread_Control *executing;
RTEMS_API_Control *api; RTEMS_API_Control *api;
ASR_Information *asr; ASR_Information *asr;
ISR_lock_Context lock_context;
executing = _Thread_Get_executing(); executing = _Thread_Get_executing();
api = (RTEMS_API_Control*)executing->API_Extensions[ THREAD_API_RTEMS ]; api = (RTEMS_API_Control*)executing->API_Extensions[ THREAD_API_RTEMS ];
asr = &api->Signal; asr = &api->Signal;
_Thread_Disable_dispatch(); /* cannot reschedule while */ _ASR_Acquire( asr, &lock_context );
/* the thread is inconsistent */
if ( !_ASR_Is_null_handler( asr_handler ) ) { if ( !_ASR_Is_null_handler( asr_handler ) ) {
asr->mode_set = mode_set; asr->mode_set = mode_set;
asr->handler = asr_handler; asr->handler = asr_handler;
} } else {
else
_ASR_Initialize( asr ); _ASR_Initialize( asr );
_Thread_Enable_dispatch(); }
_ASR_Release( asr, &lock_context );
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }