diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-13 07:12:10 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-20 07:49:38 +0200 |
commit | 9a99ce15d0878d847b4c7e054eb2996a9f5fbc34 (patch) | |
tree | ac5ebc5265e706e25aebe5c5c5cf183c7acbe222 /cpukit/score | |
parent | score: Add _Thread_Join() and _Thread_Cancel() (diff) | |
download | rtems-9a99ce15d0878d847b4c7e054eb2996a9f5fbc34.tar.bz2 |
score: Add _Thread_Set_state_locked()
This makes it possible to do thread state and thread life changes
together under protection of the thread state lock.
Update #2555.
Update #2626.
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/include/rtems/score/threadimpl.h | 5 | ||||
-rw-r--r-- | cpukit/score/src/threadsetstate.c | 23 |
2 files changed, 22 insertions, 6 deletions
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h index eee896dd4b..09e338274b 100644 --- a/cpukit/score/include/rtems/score/threadimpl.h +++ b/cpukit/score/include/rtems/score/threadimpl.h @@ -247,6 +247,11 @@ States_Control _Thread_Clear_state( States_Control state ); +States_Control _Thread_Set_state_locked( + Thread_Control *the_thread, + States_Control state +); + /** * @brief Sets the specified thread state. * diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c index 3aaa463f97..c863d1732a 100644 --- a/cpukit/score/src/threadsetstate.c +++ b/cpukit/score/src/threadsetstate.c @@ -25,18 +25,16 @@ #include <rtems/score/assert.h> #include <rtems/score/schedulerimpl.h> -States_Control _Thread_Set_state( +States_Control _Thread_Set_state_locked( Thread_Control *the_thread, States_Control state ) { - ISR_lock_Context lock_context; - States_Control previous_state; - States_Control next_state; + States_Control previous_state; + States_Control next_state; _Assert( state != 0 ); - - _Thread_State_acquire( the_thread, &lock_context ); + _Assert( _Thread_State_is_owner( the_thread ) ); previous_state = the_thread->current_state; next_state = _States_Set( state, previous_state); @@ -46,6 +44,19 @@ States_Control _Thread_Set_state( _Scheduler_Block( the_thread ); } + return previous_state; +} + +States_Control _Thread_Set_state( + Thread_Control *the_thread, + States_Control state +) +{ + ISR_lock_Context lock_context; + States_Control previous_state; + + _Thread_State_acquire( the_thread, &lock_context ); + previous_state = _Thread_Set_state_locked( the_thread, state ); _Thread_State_release( the_thread, &lock_context ); return previous_state; |