Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-21 21:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: Add and use _Scheduler_default_Tick()

Browse Source 
Delete _Scheduler_priority_Tick().  Use _SMP_Get_processor_count() for
default tick operation.  Delete _Scheduler_simple_smp_Tick().
This commit is contained in:
Sebastian Huber
2013-06-14 16:26:08 +02:00
parent 6eba7c857b
commit a3443088f5
9 changed files with 32 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/score/Makefile.am
+2 -2
View File
@@ -136,7 +136,7 @@ endif
if HAS_SMP
libscore_a_SOURCES += src/isrsmp.c src/smp.c \
src/schedulersimplesmpblock.c src/schedulersimplesmpschedule.c \
src/schedulersimplesmpunblock.c src/schedulersimplesmptick.c
src/schedulersimplesmpunblock.c
endif
## CORE_APIMUTEX_C_FILES
@@ -197,12 +197,12 @@ libscore_a_SOURCES += src/objectallocate.c src/objectclose.c \
## SCHEDULER_C_FILES
libscore_a_SOURCES += src/scheduler.c
libscore_a_SOURCES += src/schedulerdefaulttick.c
libscore_a_SOURCES += src/schedulerdefaultstartidle.c
## SCHEDULERPRIORITY_C_FILES
libscore_a_SOURCES += src/schedulerpriority.c \
src/schedulerpriorityallocate.c \
src/schedulerprioritytick.c \
src/schedulerpriorityblock.c \
src/schedulerpriorityenqueue.c \
src/schedulerpriorityenqueuefirst.c \
cpukit/score/include/rtems/score/scheduler.h
+8
View File
@@ -149,6 +149,14 @@ extern Scheduler_Control _Scheduler;
*/
void _Scheduler_Handler_initialization( void );
/**
* @brief Performs tick operations depending on the CPU budget algorithm for
* each executing thread.
*
* This routine is invoked as part of processing each clock tick.
*/
void _Scheduler_default_Tick( void );
/**
* @brief Unblocks the thread.
*
cpukit/score/include/rtems/score/schedulercbs.h
+1 -1
View File
@@ -60,7 +60,7 @@ extern "C" {
_Scheduler_EDF_Extract, /* extract entry point */ \
_Scheduler_EDF_Priority_compare, /* compares two priorities */ \
_Scheduler_CBS_Release_job, /* new period of task */ \
_Scheduler_priority_Tick, /* tick entry point */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
cpukit/score/include/rtems/score/scheduleredf.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
_Scheduler_EDF_Extract, /* extract entry point */ \
_Scheduler_EDF_Priority_compare, /* compares two priorities */ \
_Scheduler_EDF_Release_job, /* new period of task */ \
_Scheduler_priority_Tick, /* tick entry point */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
cpukit/score/include/rtems/score/schedulerpriority.h
+1 -10
View File
@@ -52,7 +52,7 @@ extern "C" {
_Scheduler_priority_Extract, /* extract entry point */ \
_Scheduler_priority_Priority_compare, /* compares two priorities */ \
_Scheduler_priority_Release_job, /* new period of task */ \
_Scheduler_priority_Tick, /* tick entry point */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
@@ -225,15 +225,6 @@ void _Scheduler_priority_Release_job (
uint32_t deadline
);
/**
* @brief Determines if the current thread allows timeslicing.
*
* This routine is invoked as part of processing each clock tick.
* It is responsible for determining if the current thread allows
* timeslicing and, if so, when its timeslice expires.
*/
void _Scheduler_priority_Tick( void );
/**
* This is the major bit map.
*/
cpukit/score/include/rtems/score/schedulersimple.h
+1 -1
View File
@@ -50,7 +50,7 @@ extern "C" {
_Scheduler_simple_Extract, /* extract entry point */ \
_Scheduler_priority_Priority_compare, /* compares two priorities */ \
_Scheduler_priority_Release_job, /* new period of task */ \
_Scheduler_priority_Tick, /* tick entry point */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
cpukit/score/include/rtems/score/schedulersimplesmp.h
+1 -10
View File
@@ -62,7 +62,7 @@ extern "C" {
_Scheduler_simple_Extract, /* extract entry point */ \
_Scheduler_priority_Priority_compare, /* compares two priorities */ \
_Scheduler_priority_Release_job, /* new period of task */ \
_Scheduler_simple_smp_Tick /* tick entry point */ \
_Scheduler_default_Tick /* tick entry point */ \
}
/**
@@ -102,15 +102,6 @@ void _Scheduler_simple_smp_Unblock(
Thread_Control *the_thread
);
/**
* @brief Invoked as part of processing each SMP clock tick.
*
* This routine is invoked as part of processing each clock tick.
* It is responsible for determining if the current thread allows
* timeslicing and, if so, when its timeslice expires.
*/
void _Scheduler_simple_smp_Tick( void );
#ifdef __cplusplus
}
#endif
cpukit/score/src/schedulerprioritytick.c → cpukit/score/src/schedulerdefaulttick.c
+17 -7
View File
@@ -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
);
}
}
cpukit/score/src/schedulersimplesmptick.c
-107
View File
@@ -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();
}