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

added code to _Thread_Clear_state to check if the state was not currently set.

Browse Source
This commit is contained in:
Joel Sherrill
1996-06-10 20:47:56 +00:00
parent fdec30ba62
commit 0f63c8627e
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
c/src/exec/score/src/thread.c
View File

@@ -718,32 +718,38 @@ void _Thread_Ready(
* select heir * select heir
*/ */
void _Thread_Clear_state( void _Thread_Clear_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
) )
{ {
ISR_Level level; ISR_Level level;
States_Control current_state;
_ISR_Disable( level ); _ISR_Disable( level );
the_thread->current_state = current_state = the_thread->current_state;
_States_Clear( state, the_thread->current_state );
if ( current_state & state ) {
current_state =
the_thread->current_state = _States_Clear( state, current_state );
if ( _States_Is_ready( the_thread->current_state ) ) { if ( _States_Is_ready( current_state ) ) {
_Priority_Add_to_bit_map( &the_thread->Priority_map ); _Priority_Add_to_bit_map( &the_thread->Priority_map );
_Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node ); _Chain_Append_unprotected(the_thread->ready, &the_thread->Object.Node);
_ISR_Flash( level ); _ISR_Flash( level );
if ( the_thread->current_priority < _Thread_Heir->current_priority ) { if ( the_thread->current_priority < _Thread_Heir->current_priority ) {
_Thread_Heir = the_thread; _Thread_Heir = the_thread;
if ( _Thread_Executing->is_preemptible || if ( _Thread_Executing->is_preemptible ||
the_thread->current_priority == 0 ) the_thread->current_priority == 0 )
_Context_Switch_necessary = TRUE; _Context_Switch_necessary = TRUE;
}
} }
} }
_ISR_Enable( level ); _ISR_Enable( level );
} }

32
cpukit/score/src/thread.c
View File

@@ -718,32 +718,38 @@ void _Thread_Ready(
* select heir * select heir
*/ */
void _Thread_Clear_state( void _Thread_Clear_state(
Thread_Control *the_thread, Thread_Control *the_thread,
States_Control state States_Control state
) )
{ {
ISR_Level level; ISR_Level level;
States_Control current_state;
_ISR_Disable( level ); _ISR_Disable( level );
the_thread->current_state = current_state = the_thread->current_state;
_States_Clear( state, the_thread->current_state );
if ( current_state & state ) {
current_state =
the_thread->current_state = _States_Clear( state, current_state );
if ( _States_Is_ready( the_thread->current_state ) ) { if ( _States_Is_ready( current_state ) ) {
_Priority_Add_to_bit_map( &the_thread->Priority_map ); _Priority_Add_to_bit_map( &the_thread->Priority_map );
_Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node ); _Chain_Append_unprotected(the_thread->ready, &the_thread->Object.Node);
_ISR_Flash( level ); _ISR_Flash( level );
if ( the_thread->current_priority < _Thread_Heir->current_priority ) { if ( the_thread->current_priority < _Thread_Heir->current_priority ) {
_Thread_Heir = the_thread; _Thread_Heir = the_thread;
if ( _Thread_Executing->is_preemptible || if ( _Thread_Executing->is_preemptible ||
the_thread->current_priority == 0 ) the_thread->current_priority == 0 )
_Context_Switch_necessary = TRUE; _Context_Switch_necessary = TRUE;
}
} }
} }
_ISR_Enable( level ); _ISR_Enable( level );
} }