diff options
-rw-r--r-- | cpukit/score/Makefile.am | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/scheduler.h | 9 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulersimple.h | 14 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/schedulersimplesmp.h | 3 | ||||
-rw-r--r-- | cpukit/score/src/schedulerdefaultupdate.c | 29 | ||||
-rw-r--r-- | cpukit/score/src/schedulersimple.c | 6 |
6 files changed, 42 insertions, 22 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index d27ce3ab76..ca5e62e035 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -181,8 +181,9 @@ libscore_a_SOURCES += src/objectallocate.c src/objectclose.c \ libscore_a_SOURCES += src/scheduler.c libscore_a_SOURCES += src/schedulerdefaultallocatefree.c libscore_a_SOURCES += src/schedulerdefaultreleasejob.c -libscore_a_SOURCES += src/schedulerdefaulttick.c libscore_a_SOURCES += src/schedulerdefaultstartidle.c +libscore_a_SOURCES += src/schedulerdefaulttick.c +libscore_a_SOURCES += src/schedulerdefaultupdate.c ## SCHEDULERPRIORITY_C_FILES libscore_a_SOURCES += src/schedulerpriority.c \ diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h index deefd9de01..a34387d8c7 100644 --- a/cpukit/score/include/rtems/score/scheduler.h +++ b/cpukit/score/include/rtems/score/scheduler.h @@ -149,6 +149,15 @@ void _Scheduler_default_Free( * @brief Does nothing. * * @param[in] thread Unused. + */ +void _Scheduler_default_Update( + Thread_Control *the_thread +); + +/** + * @brief Does nothing. + * + * @param[in] thread Unused. * @param[in] deadline Unused. */ void _Scheduler_default_Release_job( diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/cpukit/score/include/rtems/score/schedulersimple.h index 97c9e84f7f..5180d36087 100644 --- a/cpukit/score/include/rtems/score/schedulersimple.h +++ b/cpukit/score/include/rtems/score/schedulersimple.h @@ -44,7 +44,7 @@ extern "C" { _Scheduler_simple_Unblock, /* unblock entry point */ \ _Scheduler_default_Allocate, /* allocate entry point */ \ _Scheduler_default_Free, /* free entry point */ \ - _Scheduler_simple_Update, /* update entry point */ \ + _Scheduler_default_Update, /* update entry point */ \ _Scheduler_simple_Enqueue, /* enqueue entry point */ \ _Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \ _Scheduler_simple_Extract, /* extract entry point */ \ @@ -150,18 +150,6 @@ void _Scheduler_simple_Enqueue_first( ); /** - * @brief Stub for simple schedule update. - * - * This routine does nothing, and is used as a stub for Schedule update - * The overhead of a function call will still be imposed. - * - * @param[in] the_thread is the thread to be blocked - */ -void _Scheduler_simple_Update( - Thread_Control *the_thread -); - -/** * _Scheduler_simple_Ready_queue_enqueue * * This routine puts @a the_thread on the ready queue diff --git a/cpukit/score/include/rtems/score/schedulersimplesmp.h b/cpukit/score/include/rtems/score/schedulersimplesmp.h index 20462ebe74..1b827cbabe 100644 --- a/cpukit/score/include/rtems/score/schedulersimplesmp.h +++ b/cpukit/score/include/rtems/score/schedulersimplesmp.h @@ -24,7 +24,6 @@ extern "C" { #endif #include <rtems/score/scheduler.h> -#include <rtems/score/schedulersimple.h> #include <rtems/score/schedulerpriority.h> /** @@ -66,7 +65,7 @@ typedef struct { _Scheduler_simple_smp_Enqueue_priority_fifo, \ _Scheduler_default_Allocate, \ _Scheduler_default_Free, \ - _Scheduler_simple_Update, \ + _Scheduler_default_Update, \ _Scheduler_simple_smp_Enqueue_priority_fifo, \ _Scheduler_simple_smp_Enqueue_priority_lifo, \ _Scheduler_simple_smp_Extract, \ diff --git a/cpukit/score/src/schedulerdefaultupdate.c b/cpukit/score/src/schedulerdefaultupdate.c new file mode 100644 index 0000000000..ed493b0f0c --- /dev/null +++ b/cpukit/score/src/schedulerdefaultupdate.c @@ -0,0 +1,29 @@ +/** + * @file + * + * @brief Scheduler Default Update Operation + * + * @ingroup ScoreScheduler + */ + +/* + * COPYRIGHT (c) 2011. + * 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/score/scheduler.h> + +void _Scheduler_default_Update( + Thread_Control *thread +) +{ + ( void ) thread; +} diff --git a/cpukit/score/src/schedulersimple.c b/cpukit/score/src/schedulersimple.c index bd6fe31b8b..712be91d76 100644 --- a/cpukit/score/src/schedulersimple.c +++ b/cpukit/score/src/schedulersimple.c @@ -23,12 +23,6 @@ #include <rtems/score/chainimpl.h> #include <rtems/score/wkspace.h> -void _Scheduler_simple_Update( - Thread_Control *the_thread -) -{ -} - void _Scheduler_simple_Initialize ( void ) { void *f; |