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

score: Return prev state in thread state set/clear

Browse Source
This commit is contained in:
Sebastian Huber
2015-03-26 21:45:20 +01:00
parent ca10004ef2
commit 342708b983
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpukit/score/include/rtems/score/threadimpl.h
View File

@@ -242,17 +242,17 @@ void _Thread_Ready(
); );
/** /**
* @brief Clears the indicated STATES for @a the_thread. * @brief Clears the specified thread state.
* *
* This routine clears the indicated STATES for @a the_thread. It performs * In case the previous state is a non-ready state and the next state is the
* any necessary scheduling operations including the selection of * ready state, then the thread is unblocked by the scheduler.
* a new heir thread.
* *
* - INTERRUPT LATENCY: * @param[in] the_thread The thread.
* + priority map * @param[in] state The state to clear. It must not be zero.
* + select heir *
* @return The previous state.
*/ */
void _Thread_Clear_state( States_Control _Thread_Clear_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
); );
@@ -265,8 +265,10 @@ void _Thread_Clear_state(
* *
* @param[in] the_thread The thread. * @param[in] the_thread The thread.
* @param[in] state The state to set. It must not be zero. * @param[in] state The state to set. It must not be zero.
*
* @return The previous state.
*/ */
void _Thread_Set_state( States_Control _Thread_Set_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
); );

22
cpukit/score/src/threadclearstate.c
View File

@@ -19,27 +19,35 @@
#endif #endif
#include <rtems/score/threadimpl.h> #include <rtems/score/threadimpl.h>
#include <rtems/score/assert.h>
#include <rtems/score/schedulerimpl.h> #include <rtems/score/schedulerimpl.h>
void _Thread_Clear_state( States_Control _Thread_Clear_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
) )
{ {
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
States_Control current_state; States_Control previous_state;
_Assert( state != 0 );
_Scheduler_Acquire( the_thread, &lock_context ); _Scheduler_Acquire( the_thread, &lock_context );
current_state = the_thread->current_state; previous_state = the_thread->current_state;
if ( current_state & state ) {
current_state =
the_thread->current_state = _States_Clear( state, current_state );
if ( _States_Is_ready( current_state ) ) { if ( ( previous_state & state ) != 0 ) {
States_Control next_state;
next_state = _States_Clear( state, previous_state );
the_thread->current_state = next_state;
if ( _States_Is_ready( next_state ) ) {
_Scheduler_Unblock( the_thread ); _Scheduler_Unblock( the_thread );
} }
} }
_Scheduler_Release( the_thread, &lock_context ); _Scheduler_Release( the_thread, &lock_context );
return previous_state;
} }

4
cpukit/score/src/threadsetstate.c
View File

@@ -25,7 +25,7 @@
#include <rtems/score/assert.h> #include <rtems/score/assert.h>
#include <rtems/score/schedulerimpl.h> #include <rtems/score/schedulerimpl.h>
void _Thread_Set_state( States_Control _Thread_Set_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
) )
@@ -47,4 +47,6 @@ void _Thread_Set_state(
} }
_Scheduler_Release( the_thread, &lock_context ); _Scheduler_Release( the_thread, &lock_context );
return previous_state;
} }