diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-06 15:32:22 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-06-14 16:26:08 +0200 |
commit | a3443088f547091ac2a489701557e29acbf24a0e (patch) | |
tree | 65727a9cb8abb8226579dfb794ad40bd7399f173 /cpukit/score/src | |
parent | scheduler: Specify thread of yield operation (diff) | |
download | rtems-a3443088f547091ac2a489701557e29acbf24a0e.tar.bz2 |
scheduler: Add and use _Scheduler_default_Tick()
Delete _Scheduler_priority_Tick(). Use _SMP_Get_processor_count() for
default tick operation. Delete _Scheduler_simple_smp_Tick().
Diffstat (limited to 'cpukit/score/src')
-rw-r--r-- | cpukit/score/src/schedulerdefaulttick.c (renamed from cpukit/score/src/schedulerprioritytick.c) | 24 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimplesmptick.c | 107 |
2 files changed, 17 insertions, 114 deletions
diff --git a/cpukit/score/src/schedulerprioritytick.c b/cpukit/score/src/schedulerdefaulttick.c index 7ce3efdb3a..a9bc58a8c2 100644 --- a/cpukit/score/src/schedulerprioritytick.c +++ b/cpukit/score/src/schedulerdefaulttick.c @@ -1,7 +1,7 @@ /** * @file * - * @brief Priority Scheduler At Tick Handler + * @brief Default Scheduler At Tick Handler * * @ingroup ScoreScheduler */ @@ -20,14 +20,12 @@ #endif #include <rtems/system.h> -#include <rtems/score/schedulerpriority.h> +#include <rtems/score/scheduler.h> +#include <rtems/score/thread.h> +#include <rtems/score/smp.h> -void _Scheduler_priority_Tick( void ) +static void _Scheduler_default_Tick_for_executing( Thread_Control *executing ) { - Thread_Control *executing; - - executing = _Thread_Executing; - #ifdef __RTEMS_USE_TICKS_FOR_STATISTICS__ /* * Increment the number of ticks this thread has been executing @@ -81,3 +79,15 @@ void _Scheduler_priority_Tick( void ) #endif } } + +void _Scheduler_default_Tick( void ) +{ + uint32_t processor_count = _SMP_Get_processor_count(); + uint32_t processor; + + for ( processor = 0 ; processor < processor_count ; ++processor ) { + _Scheduler_default_Tick_for_executing( + _Per_CPU_Information[ processor ].executing + ); + } +} diff --git a/cpukit/score/src/schedulersimplesmptick.c b/cpukit/score/src/schedulersimplesmptick.c deleted file mode 100644 index 72f8b1f761..0000000000 --- a/cpukit/score/src/schedulersimplesmptick.c +++ /dev/null @@ -1,107 +0,0 @@ -/** - * @file - * - * @brief Scheduler Simple SMP Tick Method - * @ingroup ScoreScheduler - */ - -/* - * COPYRIGHT (c) 1989-2009. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include <rtems/system.h> -#include <rtems/score/schedulersimplesmp.h> -#include <rtems/score/smp.h> - -static void _Scheduler_simple_smp_Tick_helper( - int cpu -) -{ - Thread_Control *executing; - ISR_Level level; - - executing = _Per_CPU_Information[cpu].executing; - - #ifdef __RTEMS_USE_TICKS_FOR_STATISTICS__ - /* - * Increment the number of ticks this thread has been executing - */ - executing->cpu_time_used++; - #endif - - /* - * If the thread is not preemptible or is not ready, then - * just return. - */ - - if ( !executing->is_preemptible ) - return; - - if ( !_States_Is_ready( executing->current_state ) ) - return; - - /* - * The cpu budget algorithm determines what happens next. - */ - - switch ( executing->budget_algorithm ) { - case THREAD_CPU_BUDGET_ALGORITHM_NONE: - break; - - case THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE: - #if defined(RTEMS_SCORE_THREAD_ENABLE_EXHAUST_TIMESLICE) - case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE: - #endif - if ( (int)(--executing->cpu_time_budget) <= 0 ) { - - /* - * A yield performs the ready chain mechanics needed when - * resetting a timeslice. If no other thread's are ready - * at the priority of the currently executing thread, then the - * executing thread's timeslice is reset. Otherwise, the - * currently executing thread is placed at the rear of the - * FIFO for this priority and a new heir is selected. - * - * In the SMP case, we do the chain manipulation for every - * CPU, then schedule after all CPUs have been evaluated. - */ - _ISR_Disable( level ); - _Scheduler_simple_Ready_queue_requeue( &_Scheduler, executing ); - _ISR_Enable( level ); - - executing->cpu_time_budget = _Thread_Ticks_per_timeslice; - } - break; - - #if defined(RTEMS_SCORE_THREAD_ENABLE_SCHEDULER_CALLOUT) - case THREAD_CPU_BUDGET_ALGORITHM_CALLOUT: - if ( --executing->cpu_time_budget == 0 ) - (*executing->budget_callout)( executing ); - break; - #endif - } -} - -void _Scheduler_simple_smp_Tick( void ) -{ - uint32_t cpu; - - /* - * Iterate over all cores, updating time slicing information - * and logically performing a yield. Then perform a schedule - * operation to account for all the changes. - */ - for ( cpu=0 ; cpu < _SMP_Processor_count ; cpu++ ) { - _Scheduler_simple_smp_Tick_helper( cpu ); - } - _Scheduler_simple_smp_Schedule(); -} |