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

2008-05-16 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
* score/src/threadchangepriority.c: Just in case the transient
	state was set when we entered, ensure that it is still set when
	we exit.
	* score/src/threadclose.c: When a thread is being deleted, it should
	go into the dormant state -- not the transient state.
This commit is contained in:
Joel Sherrill
2008-05-16 21:51:40 +00:00
parent c140c6f534
commit d9aca5f537
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
2008-05-16 Till Straumann <strauman@slac.stanford.edu>
* score/src/threadchangepriority.c: Just in case the transient
state was set when we entered, ensure that it is still set when
we exit.
* score/src/threadclose.c: When a thread is being deleted, it should
go into the dormant state -- not the transient state.
2008-05-15 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* libi2c/libi2c.h, libi2c/libi2c.h: added interface to query

38
cpukit/score/src/threadchangepriority.c
View File

@@ -56,7 +56,7 @@ void _Thread_Change_priority(
)
{
ISR_Level level;
States_Control state;
States_Control state, original_state;
/*
* If this is a case where prepending the task to its priority is
@@ -73,6 +73,11 @@ void _Thread_Change_priority(
prepend_it = TRUE;
*/
/*
* Save original state
*/
original_state = the_thread->current_state;
/*
* Set a transient state for the thread so it is pulled off the Ready chains.
* This will prevent it from being scheduled no matter what happens in an
@@ -95,7 +100,9 @@ void _Thread_Change_priority(
*/
state = the_thread->current_state;
if ( state != STATES_TRANSIENT ) {
the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
/* Only clear the transient state if it wasn't set already */
if ( ! _States_Is_transient( original_state ) )
the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
_ISR_Enable( level );
if ( _States_Is_waiting_on_thread_queue( state ) ) {
_Thread_queue_Requeue( the_thread->Wait.queue, the_thread );
@@ -103,19 +110,22 @@ void _Thread_Change_priority(
return;
}
/*
* Interrupts are STILL disabled.
* We now know the thread will be in the READY state when we remove
* the TRANSIENT state. So we have to place it on the appropriate
* Ready Queue with interrupts off.
*/
the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
/* Only clear the transient state if it wasn't set already */
if ( ! _States_Is_transient( original_state ) ) {
/*
* Interrupts are STILL disabled.
* We now know the thread will be in the READY state when we remove
* the TRANSIENT state. So we have to place it on the appropriate
* Ready Queue with interrupts off.
*/
the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
_Priority_Add_to_bit_map( &the_thread->Priority_map );
if ( prepend_it )
_Chain_Prepend_unprotected( the_thread->ready, &the_thread->Object.Node );
else
_Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node );
_Priority_Add_to_bit_map( &the_thread->Priority_map );
if ( prepend_it )
_Chain_Prepend_unprotected( the_thread->ready, &the_thread->Object.Node );
else
_Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node );
}
_ISR_Flash( level );

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

@@ -66,10 +66,10 @@ void _Thread_Close(
_Objects_Close( information, &the_thread->Object );
/*
* By setting the transient state, the thread will not be considered
* By setting the dormant state, the thread will not be considered
* for scheduling when we remove any blocking states.
*/
_Thread_Set_state( the_thread, STATES_TRANSIENT );
_Thread_Set_state( the_thread, STATES_DORMANT );
if ( !_Thread_queue_Extract_with_proxy( the_thread ) ) {
if ( _Watchdog_Is_active( &the_thread->Timer ) )