diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-08 10:38:19 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-08 16:30:48 +0200 |
commit | 19e417678a3d68c5dee3708bf699b1f9e38ff1cb (patch) | |
tree | 442e9f0f2faab0b983c614fdd8dcb829e3ce6911 /cpukit/score/include/rtems/score/schedulersmpimpl.h | |
parent | score: Rename _Scheduler_SMP_Update_heir() (diff) | |
download | rtems-19e417678a3d68c5dee3708bf699b1f9e38ff1cb.tar.bz2 |
score: Simplify SMP processor allocation
Avoid copy and paste and set the scheduler node state in one place.
Diffstat (limited to 'cpukit/score/include/rtems/score/schedulersmpimpl.h')
-rw-r--r-- | cpukit/score/include/rtems/score/schedulersmpimpl.h | 61 |
1 files changed, 46 insertions, 15 deletions
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/score/include/rtems/score/schedulersmpimpl.h index 3bd4795ce7..425dae2942 100644 --- a/cpukit/score/include/rtems/score/schedulersmpimpl.h +++ b/cpukit/score/include/rtems/score/schedulersmpimpl.h @@ -313,8 +313,8 @@ typedef void ( *Scheduler_SMP_Enqueue )( typedef void ( *Scheduler_SMP_Allocate_processor )( Scheduler_Context *context, - Scheduler_Node *scheduled, - Scheduler_Node *victim + Thread_Control *scheduled, + Thread_Control *victim ); static inline bool _Scheduler_SMP_Insert_priority_lifo_order( @@ -410,24 +410,17 @@ static inline bool _Scheduler_SMP_Is_processor_owned_by_us( return cpu->scheduler_context == context; } -static inline void _Scheduler_SMP_Allocate_processor( +static inline void _Scheduler_SMP_Allocate_processor_lazy( Scheduler_Context *context, - Scheduler_Node *scheduled, - Scheduler_Node *victim + Thread_Control *scheduled_thread, + Thread_Control *victim_thread ) { - Thread_Control *scheduled_thread = _Scheduler_Node_get_owner( scheduled ); - Thread_Control *victim_thread = _Scheduler_Node_get_owner( victim ); Per_CPU_Control *scheduled_cpu = _Thread_Get_CPU( scheduled_thread ); Per_CPU_Control *victim_cpu = _Thread_Get_CPU( victim_thread ); Per_CPU_Control *cpu_self = _Per_CPU_Get(); Thread_Control *heir; - _Scheduler_SMP_Node_change_state( - _Scheduler_SMP_Node_downcast( scheduled ), - SCHEDULER_SMP_NODE_SCHEDULED - ); - _Assert( _ISR_Get_level() != 0 ); if ( _Thread_Is_executing_on_a_processor( scheduled_thread ) ) { @@ -455,6 +448,24 @@ static inline void _Scheduler_SMP_Allocate_processor( } } +static inline void _Scheduler_SMP_Allocate_processor( + Scheduler_Context *context, + Scheduler_Node *scheduled, + Scheduler_Node *victim, + Scheduler_SMP_Allocate_processor allocate_processor +) +{ + Thread_Control *scheduled_thread = _Scheduler_Node_get_owner( scheduled ); + Thread_Control *victim_thread = _Scheduler_Node_get_owner( victim ); + + _Scheduler_SMP_Node_change_state( + _Scheduler_SMP_Node_downcast( scheduled ), + SCHEDULER_SMP_NODE_SCHEDULED + ); + + ( *allocate_processor )( context, scheduled_thread, victim_thread ); +} + static inline Scheduler_Node *_Scheduler_SMP_Get_lowest_scheduled( Scheduler_Context *context, Scheduler_Node *filter, @@ -514,7 +525,14 @@ static inline void _Scheduler_SMP_Enqueue_ordered( _Scheduler_SMP_Node_downcast( lowest_scheduled ), SCHEDULER_SMP_NODE_READY ); - ( *allocate_processor )( context, node, lowest_scheduled ); + + _Scheduler_SMP_Allocate_processor( + context, + node, + lowest_scheduled, + allocate_processor + ); + ( *insert_scheduled )( context, node ); ( *move_from_scheduled_to_ready )( context, lowest_scheduled ); } else { @@ -565,7 +583,14 @@ static inline void _Scheduler_SMP_Enqueue_scheduled_ordered( _Scheduler_SMP_Node_downcast( node ), SCHEDULER_SMP_NODE_READY ); - ( *allocate_processor) ( context, highest_ready, node ); + + _Scheduler_SMP_Allocate_processor( + context, + highest_ready, + node, + allocate_processor + ); + ( *insert_ready )( context, node ); ( *move_from_ready_to_scheduled )( context, highest_ready ); } @@ -588,7 +613,13 @@ static inline void _Scheduler_SMP_Schedule_highest_ready( { Scheduler_Node *highest_ready = ( *get_highest_ready )( context, victim ); - ( *allocate_processor )( context, highest_ready, victim ); + _Scheduler_SMP_Allocate_processor( + context, + highest_ready, + victim, + allocate_processor + ); + ( *move_from_ready_to_scheduled )( context, highest_ready ); } |