diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-30 18:53:06 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-30 18:53:06 +0000 |
commit | 4b1d26142c68cd1eeaa5a8da1ff8c120508775c0 (patch) | |
tree | 55f46eec768aa07520137b2cdc1100ba2251d5f9 /cpukit | |
parent | 2010-07-30 Gedare Bloom <giddyup44@yahoo.com> (diff) | |
download | rtems-4b1d26142c68cd1eeaa5a8da1ff8c120508775c0.tar.bz2 |
2010-07-30 Gedare Bloom <giddyup44@yahoo.com>
PR 1599/cpukit
* posix/src/psignalunblockthread.c, posix/src/pthreadkill.c,
rtems/src/signalsend.c, score/include/rtems/score/percpu.h,
score/inline/rtems/score/thread.inl, score/src/thread.c,
score/src/threadchangepriority.c, score/src/threadclearstate.c,
score/src/threaddispatch.c, score/src/threadready.c,
score/src/threadresume.c, score/src/threadsetstate.c,
score/src/threadstartmultitasking.c, score/src/threadsuspend.c,
score/src/threadyieldprocessor.c: Rename _Context_Switch_necessary to
_Thread_Dispatch_necessary to more properly reflect the intent.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 13 | ||||
-rw-r--r-- | cpukit/posix/src/psignalunblockthread.c | 2 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadkill.c | 2 | ||||
-rw-r--r-- | cpukit/rtems/src/signalsend.c | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/percpu.h | 4 | ||||
-rw-r--r-- | cpukit/score/inline/rtems/score/thread.inl | 4 | ||||
-rw-r--r-- | cpukit/score/src/thread.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadchangepriority.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadclearstate.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threaddispatch.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/threadready.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadresume.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadsetstate.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadstartmultitasking.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadsuspend.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadyieldprocessor.c | 4 |
16 files changed, 32 insertions, 19 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a060dcd9fd..2a0e14387c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,16 @@ +2010-07-30 Gedare Bloom <giddyup44@yahoo.com> + + PR 1599/cpukit + * posix/src/psignalunblockthread.c, posix/src/pthreadkill.c, + rtems/src/signalsend.c, score/include/rtems/score/percpu.h, + score/inline/rtems/score/thread.inl, score/src/thread.c, + score/src/threadchangepriority.c, score/src/threadclearstate.c, + score/src/threaddispatch.c, score/src/threadready.c, + score/src/threadresume.c, score/src/threadsetstate.c, + score/src/threadstartmultitasking.c, score/src/threadsuspend.c, + score/src/threadyieldprocessor.c: Rename _Context_Switch_necessary to + _Thread_Dispatch_necessary to more properly reflect the intent. + 2010-07-30 Vinu Rajashekhar <vinutheraj@gmail.com> * sapi/include/confdefs.h: Add configuration macros for Go diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c index 00ac214404..baa55c34c2 100644 --- a/cpukit/posix/src/psignalunblockthread.c +++ b/cpukit/posix/src/psignalunblockthread.c @@ -113,7 +113,7 @@ bool _POSIX_signals_Unblock_thread( } else if ( the_thread->current_state == STATES_READY ) { if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } } return false; diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c index 6d96067049..44d3146fe6 100644 --- a/cpukit/posix/src/pthreadkill.c +++ b/cpukit/posix/src/pthreadkill.c @@ -64,7 +64,7 @@ int pthread_kill( (void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL ); if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } _Thread_Enable_dispatch(); return 0; diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c index f51b168997..031a18979e 100644 --- a/cpukit/rtems/src/signalsend.c +++ b/cpukit/rtems/src/signalsend.c @@ -65,7 +65,7 @@ rtems_status_code rtems_signal_send( _ASR_Post_signals( signal_set, &asr->signals_posted ); if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } else { _ASR_Post_signals( signal_set, &asr->signals_pending ); } diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h index ac92e1f9c7..2778573481 100644 --- a/cpukit/score/include/rtems/score/percpu.h +++ b/cpukit/score/include/rtems/score/percpu.h @@ -85,7 +85,7 @@ typedef struct { Thread_Control *idle; /** This is set to true when this CPU needs to run the dispatcher. */ - volatile bool dispatch_needed; + volatile bool dispatch_necessary; } Per_CPU_Control; #endif @@ -160,7 +160,7 @@ extern Per_CPU_Control _Per_CPU_Information; #define _ISR_Nest_level _Per_CPU_Information.isr_nest_level #define _CPU_Interrupt_stack_low _Per_CPU_Information.interrupt_stack_low #define _CPU_Interrupt_stack_high _Per_CPU_Information.interrupt_stack_high -#define _Context_Switch_necessary _Per_CPU_Information.dispatch_needed +#define _Thread_Dispatch_necessary _Per_CPU_Information.dispatch_necessary #endif /* ASM */ diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl index d008989915..d0a9e703f7 100644 --- a/cpukit/score/inline/rtems/score/thread.inl +++ b/cpukit/score/inline/rtems/score/thread.inl @@ -258,7 +258,7 @@ RTEMS_INLINE_ROUTINE bool _Thread_Is_dispatching_enabled( void ) RTEMS_INLINE_ROUTINE bool _Thread_Is_context_switch_necessary( void ) { - return ( _Context_Switch_necessary ); + return ( _Thread_Dispatch_necessary ); } /** @@ -351,7 +351,7 @@ RTEMS_INLINE_ROUTINE bool _Thread_Evaluate_is_dispatch_needed( if ( are_signals_pending || (!_Thread_Is_heir( executing ) && executing->is_preemptible) ) { - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; return true; } diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c index e96770acf1..f0891373f6 100644 --- a/cpukit/score/src/thread.c +++ b/cpukit/score/src/thread.c @@ -69,7 +69,7 @@ void _Thread_Handler_initialization(void) INTERNAL_ERROR_BAD_STACK_HOOK ); - _Context_Switch_necessary = false; + _Thread_Dispatch_necessary = false; _Thread_Executing = NULL; _Thread_Heir = NULL; #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE ) diff --git a/cpukit/score/src/threadchangepriority.c b/cpukit/score/src/threadchangepriority.c index 5e14edd575..58f5eb5fd3 100644 --- a/cpukit/score/src/threadchangepriority.c +++ b/cpukit/score/src/threadchangepriority.c @@ -137,6 +137,6 @@ void _Thread_Change_priority( if ( !_Thread_Is_executing_also_the_heir() && _Thread_Executing->is_preemptible ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; _ISR_Enable( level ); } diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c index 9f89f1a736..c5ab03497a 100644 --- a/cpukit/score/src/threadclearstate.c +++ b/cpukit/score/src/threadclearstate.c @@ -89,7 +89,7 @@ void _Thread_Clear_state( _Thread_Heir = the_thread; if ( _Thread_Executing->is_preemptible || the_thread->current_priority == 0 ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } } } diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 3d7fe24947..6b745ea281 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -89,10 +89,10 @@ void _Thread_Dispatch( void ) executing = _Thread_Executing; _ISR_Disable( level ); - while ( _Context_Switch_necessary == true ) { + while ( _Thread_Dispatch_necessary == true ) { heir = _Thread_Heir; _Thread_Dispatch_disable_level = 1; - _Context_Switch_necessary = false; + _Thread_Dispatch_necessary = false; _Thread_Executing = heir; /* diff --git a/cpukit/score/src/threadready.c b/cpukit/score/src/threadready.c index ea6f349704..3daa6506bd 100644 --- a/cpukit/score/src/threadready.c +++ b/cpukit/score/src/threadready.c @@ -72,7 +72,7 @@ void _Thread_Ready( heir = _Thread_Heir; if ( !_Thread_Is_executing( heir ) && _Thread_Executing->is_preemptible ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; _ISR_Enable( level ); } diff --git a/cpukit/score/src/threadresume.c b/cpukit/score/src/threadresume.c index f1ad9ab0bc..c82466d3b3 100644 --- a/cpukit/score/src/threadresume.c +++ b/cpukit/score/src/threadresume.c @@ -79,7 +79,7 @@ void _Thread_Resume( _Thread_Heir = the_thread; if ( _Thread_Executing->is_preemptible || the_thread->current_priority == 0 ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } } } diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c index e1bb9d80db..2edd3bb70d 100644 --- a/cpukit/score/src/threadsetstate.c +++ b/cpukit/score/src/threadsetstate.c @@ -81,7 +81,7 @@ void _Thread_Set_state( _Thread_Calculate_heir(); if ( _Thread_Is_executing( the_thread ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; _ISR_Enable( level ); } diff --git a/cpukit/score/src/threadstartmultitasking.c b/cpukit/score/src/threadstartmultitasking.c index 08c66c3d66..c1311554ea 100644 --- a/cpukit/score/src/threadstartmultitasking.c +++ b/cpukit/score/src/threadstartmultitasking.c @@ -61,7 +61,7 @@ void _Thread_Start_multitasking( void ) _System_state_Set( SYSTEM_STATE_UP ); - _Context_Switch_necessary = false; + _Thread_Dispatch_necessary = false; _Thread_Executing = _Thread_Heir; diff --git a/cpukit/score/src/threadsuspend.c b/cpukit/score/src/threadsuspend.c index 27540ecfef..8cb2796691 100644 --- a/cpukit/score/src/threadsuspend.c +++ b/cpukit/score/src/threadsuspend.c @@ -79,7 +79,7 @@ void _Thread_Suspend( _Thread_Calculate_heir(); if ( _Thread_Is_executing( the_thread ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; _ISR_Enable( level ); } diff --git a/cpukit/score/src/threadyieldprocessor.c b/cpukit/score/src/threadyieldprocessor.c index 9defbeab34..633292d3f6 100644 --- a/cpukit/score/src/threadyieldprocessor.c +++ b/cpukit/score/src/threadyieldprocessor.c @@ -67,10 +67,10 @@ void _Thread_Yield_processor( void ) if ( _Thread_Is_heir( executing ) ) _Thread_Heir = (Thread_Control *) ready->first; - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; } else if ( !_Thread_Is_heir( executing ) ) - _Context_Switch_necessary = true; + _Thread_Dispatch_necessary = true; _ISR_Enable( level ); } |