summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/score/Makefile.am2
-rw-r--r--cpukit/score/include/rtems/score/scheduler.h11
-rw-r--r--cpukit/score/include/rtems/score/schedulerpriority.h16
-rw-r--r--cpukit/score/include/rtems/score/schedulersimple.h2
-rw-r--r--cpukit/score/include/rtems/score/schedulersimplesmp.h2
-rw-r--r--cpukit/score/src/schedulerdefaultreleasejob.c (renamed from cpukit/score/src/schedulerpriorityreleasejob.c)19
6 files changed, 24 insertions, 28 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 2e45590b41..609772c32c 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -179,6 +179,7 @@ libscore_a_SOURCES += src/objectallocate.c src/objectclose.c \
## SCHEDULER_C_FILES
libscore_a_SOURCES += src/scheduler.c
+libscore_a_SOURCES += src/schedulerdefaultreleasejob.c
libscore_a_SOURCES += src/schedulerdefaulttick.c
libscore_a_SOURCES += src/schedulerdefaultstartidle.c
@@ -191,7 +192,6 @@ libscore_a_SOURCES += src/schedulerpriority.c \
src/schedulerpriorityextract.c \
src/schedulerpriorityfree.c \
src/schedulerpriorityprioritycompare.c \
- src/schedulerpriorityreleasejob.c \
src/schedulerpriorityschedule.c \
src/schedulerpriorityunblock.c \
src/schedulerpriorityupdate.c \
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index 2e5d779076..1b2ac8fff8 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -126,6 +126,17 @@ typedef struct {
extern Scheduler_Control _Scheduler;
/**
+ * @brief Does nothing.
+ *
+ * @param[in] thread Unused.
+ * @param[in] deadline Unused.
+ */
+void _Scheduler_default_Release_job(
+ Thread_Control *thread,
+ uint32_t deadline
+);
+
+/**
* @brief Performs tick operations depending on the CPU budget algorithm for
* each executing thread.
*
diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/score/include/rtems/score/schedulerpriority.h
index 862f9e1c7d..69649435bd 100644
--- a/cpukit/score/include/rtems/score/schedulerpriority.h
+++ b/cpukit/score/include/rtems/score/schedulerpriority.h
@@ -51,7 +51,7 @@ extern "C" {
_Scheduler_priority_Enqueue_first, /* enqueue_first entry point */ \
_Scheduler_priority_Extract, /* extract entry point */ \
_Scheduler_priority_Priority_compare, /* compares two priorities */ \
- _Scheduler_priority_Release_job, /* new period of task */ \
+ _Scheduler_default_Release_job, /* new period of task */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
@@ -211,20 +211,6 @@ int _Scheduler_priority_Priority_compare(
Priority_Control p2
);
-/**
- * @brief Called when a new job of task is released.
- *
- * This routine is called when a new job of task is released.
- *
- * @param[in] the_thread is the owner of the job.
- * @param[in] deadline of the new job from now. If equal to 0,
- * the job was cancelled or deleted.
- */
-void _Scheduler_priority_Release_job (
- Thread_Control *the_thread,
- uint32_t deadline
-);
-
/**@}*/
#ifdef __cplusplus
diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/cpukit/score/include/rtems/score/schedulersimple.h
index ba67c14729..b4f7345e2c 100644
--- a/cpukit/score/include/rtems/score/schedulersimple.h
+++ b/cpukit/score/include/rtems/score/schedulersimple.h
@@ -49,7 +49,7 @@ extern "C" {
_Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \
_Scheduler_simple_Extract, /* extract entry point */ \
_Scheduler_priority_Priority_compare, /* compares two priorities */ \
- _Scheduler_priority_Release_job, /* new period of task */ \
+ _Scheduler_default_Release_job, /* new period of task */ \
_Scheduler_default_Tick, /* tick entry point */ \
_Scheduler_default_Start_idle /* start idle entry point */ \
}
diff --git a/cpukit/score/include/rtems/score/schedulersimplesmp.h b/cpukit/score/include/rtems/score/schedulersimplesmp.h
index 1c7e125479..c21b9d492e 100644
--- a/cpukit/score/include/rtems/score/schedulersimplesmp.h
+++ b/cpukit/score/include/rtems/score/schedulersimplesmp.h
@@ -71,7 +71,7 @@ typedef struct {
_Scheduler_simple_smp_Enqueue_priority_lifo, \
_Scheduler_simple_smp_Extract, \
_Scheduler_priority_Priority_compare, \
- _Scheduler_priority_Release_job, \
+ _Scheduler_default_Release_job, \
_Scheduler_default_Tick, \
_Scheduler_simple_smp_Start_idle \
}
diff --git a/cpukit/score/src/schedulerpriorityreleasejob.c b/cpukit/score/src/schedulerdefaultreleasejob.c
index a62a10a850..99356e55ac 100644
--- a/cpukit/score/src/schedulerpriorityreleasejob.c
+++ b/cpukit/score/src/schedulerdefaultreleasejob.c
@@ -1,8 +1,9 @@
/**
- * @file
+ * @file
*
- * @brief Scheduler Priority Release Job
- * @ingroup ScoreScheduler
+ * @brief Default Scheduler Release Job Operation
+ *
+ * @ingroup ScoreScheduler
*/
/*
@@ -18,15 +19,13 @@
#include "config.h"
#endif
-#include <rtems/system.h>
-#include <rtems/config.h>
#include <rtems/score/scheduler.h>
-#include <rtems/score/schedulerpriority.h>
-void _Scheduler_priority_Release_job(
- Thread_Control *the_thread,
- uint32_t deadline
+void _Scheduler_default_Release_job(
+ Thread_Control *thread,
+ uint32_t deadline
)
{
- return;
+ ( void ) thread;
+ ( void ) deadline;
}