diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-10 06:47:19 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-12 13:24:40 +0200 |
commit | 105b4e6fa5005ce41c363711dec49851d4aef66f (patch) | |
tree | 23ded5915c1438a5a5c6285ab2db16d1abe480d5 /cpukit/rtems/src | |
parent | score: Introduce thread state lock (diff) | |
download | rtems-105b4e6fa5005ce41c363711dec49851d4aef66f.tar.bz2 |
rtems: Use thread state lock for signals
Diffstat (limited to 'cpukit/rtems/src')
-rw-r--r-- | cpukit/rtems/src/signalcatch.c | 17 | ||||
-rw-r--r-- | cpukit/rtems/src/signalsend.c | 8 | ||||
-rw-r--r-- | cpukit/rtems/src/taskmode.c | 6 | ||||
-rw-r--r-- | cpukit/rtems/src/tasks.c | 48 |
4 files changed, 15 insertions, 64 deletions
diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c index e300890f6a..9c264b7869 100644 --- a/cpukit/rtems/src/signalcatch.c +++ b/cpukit/rtems/src/signalcatch.c @@ -25,6 +25,8 @@ #include <rtems/score/assert.h> #include <rtems/score/threadimpl.h> +RTEMS_STATIC_ASSERT( RTEMS_DEFAULT_MODES == 0, _ASR_Create_mode_set ); + void _Signal_Action_handler( Thread_Control *executing, Thread_Action *action, @@ -37,19 +39,17 @@ void _Signal_Action_handler( Modes_Control prev_mode; (void) action; - _Thread_State_release( executing, lock_context ); - - api = executing->API_Extensions[ THREAD_API_RTEMS ]; - if ( !api ) - return; /* * Signal Processing */ + api = executing->API_Extensions[ THREAD_API_RTEMS ]; asr = &api->Signal; signal_set = _ASR_Get_posted_signals( asr ); + _Thread_State_release( executing, lock_context ); + if ( signal_set == 0 ) { return; } @@ -73,13 +73,10 @@ rtems_status_code rtems_signal_catch( ASR_Information *asr; ISR_lock_Context lock_context; - _ISR_lock_ISR_disable( &lock_context ); - executing = _Thread_Executing; + executing = _Thread_State_acquire_for_executing( &lock_context ); api = executing->API_Extensions[ THREAD_API_RTEMS ]; asr = &api->Signal; - _ASR_Acquire_critical( asr, &lock_context ); - if ( !_ASR_Is_null_handler( asr_handler ) ) { asr->mode_set = mode_set; asr->handler = asr_handler; @@ -87,7 +84,7 @@ rtems_status_code rtems_signal_catch( _ASR_Initialize( asr ); } - _ASR_Release( asr, &lock_context ); + _Thread_State_release( executing, &lock_context ); return RTEMS_SUCCESSFUL; } diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c index abf3d5d1a3..9be8460d66 100644 --- a/cpukit/rtems/src/signalsend.c +++ b/cpukit/rtems/src/signalsend.c @@ -51,10 +51,10 @@ rtems_status_code rtems_signal_send( api = the_thread->API_Extensions[ THREAD_API_RTEMS ]; asr = &api->Signal; - _ASR_Acquire_critical( asr, &lock_context ); + _Thread_State_acquire_critical( the_thread, &lock_context ); if ( _ASR_Is_null_handler( asr->handler ) ) { - _ASR_Release( asr, &lock_context ); + _Thread_State_release( the_thread, &lock_context ); return RTEMS_NOT_DEFINED; } @@ -62,8 +62,6 @@ rtems_status_code rtems_signal_send( Per_CPU_Control *cpu_self; _ASR_Post_signals( signal_set, &asr->signals_posted ); - _ASR_Release( asr, &lock_context ); - _Thread_State_acquire( the_thread, &lock_context ); _Thread_Add_post_switch_action( the_thread, &api->Signal_action, @@ -74,7 +72,7 @@ rtems_status_code rtems_signal_send( _Thread_Dispatch_enable( cpu_self ); } else { _ASR_Post_signals( signal_set, &asr->signals_pending ); - _ASR_Release( asr, &lock_context ); + _Thread_State_release( the_thread, &lock_context ); } return RTEMS_SUCCESSFUL; diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c index 2f8f354b16..131632db0b 100644 --- a/cpukit/rtems/src/taskmode.c +++ b/cpukit/rtems/src/taskmode.c @@ -98,20 +98,22 @@ rtems_status_code rtems_task_mode( if ( mask & RTEMS_ASR_MASK ) { bool is_asr_enabled = !_Modes_Is_asr_disabled( mode_set ); + _Thread_State_acquire( executing, &lock_context ); + if ( is_asr_enabled != asr->is_enabled ) { asr->is_enabled = is_asr_enabled; if ( _ASR_Swap_signals( asr ) != 0 ) { needs_asr_dispatching = true; - _Thread_State_acquire( executing, &lock_context ); _Thread_Add_post_switch_action( executing, &api->Signal_action, _Signal_Action_handler ); - _Thread_State_release( executing, &lock_context ); } } + + _Thread_State_release( executing, &lock_context ); } if ( preempt_enabled || needs_asr_dispatching ) { diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index 56b2455ad7..b4ebff6ff5 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -20,7 +20,6 @@ #include <rtems/config.h> #include <rtems/sysinit.h> -#include <rtems/rtems/asrimpl.h> #include <rtems/rtems/eventimpl.h> #include <rtems/rtems/tasksimpl.h> #include <rtems/score/threadimpl.h> @@ -28,37 +27,6 @@ Thread_Information _RTEMS_tasks_Information; -/* - * _RTEMS_tasks_Create_extension - * - * This routine is an extension routine that is invoked as part - * of creating any type of task or thread in the system. If the - * task is created via another API, then this routine is invoked - * and this API given the opportunity to initialize its extension - * area. - */ - -static bool _RTEMS_tasks_Create_extension( - Thread_Control *executing, - Thread_Control *created -) -{ - RTEMS_API_Control *api; - - api = created->API_Extensions[ THREAD_API_RTEMS ]; - - _ASR_Create( &api->Signal ); - - return true; -} - -/* - * _RTEMS_tasks_Start_extension - * - * This extension routine is invoked when a task is started for the - * first time. - */ - static void _RTEMS_tasks_Start_extension( Thread_Control *executing, Thread_Control *started @@ -72,24 +40,10 @@ static void _RTEMS_tasks_Start_extension( _Event_Initialize( &api->System_event ); } -static void _RTEMS_tasks_Delete_extension( - Thread_Control *executing, - Thread_Control *deleted -) -{ - RTEMS_API_Control *api; - - api = deleted->API_Extensions[ THREAD_API_RTEMS ]; - - _ASR_Destroy( &api->Signal ); -} - User_extensions_Control _RTEMS_tasks_User_extensions = { .Callouts = { - .thread_create = _RTEMS_tasks_Create_extension, .thread_start = _RTEMS_tasks_Start_extension, - .thread_restart = _RTEMS_tasks_Start_extension, - .thread_delete = _RTEMS_tasks_Delete_extension + .thread_restart = _RTEMS_tasks_Start_extension } }; |