RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Remove hidden deadline overrule for CBS

Browse Source 
Do what the user commands.  Maybe we should add a rtems_cbs_period()
that calls rtems_rate_monotonic_period() with the right parameter.

Update #2173.
This commit is contained in:
Sebastian Huber
2016-06-16 17:23:16 +02:00
parent 77ff5599e0
commit 7ec66e0890
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cpukit/score/src/schedulercbsreleasejob.c
View File

@@ -20,8 +20,6 @@
#endif #endif
#include <rtems/score/schedulercbsimpl.h> #include <rtems/score/schedulercbsimpl.h>
#include <rtems/score/threadimpl.h>
#include <rtems/score/watchdogimpl.h>
void _Scheduler_CBS_Release_job( void _Scheduler_CBS_Release_job(
const Scheduler_Control *scheduler, const Scheduler_Control *scheduler,
@@ -29,28 +27,16 @@ void _Scheduler_CBS_Release_job(
uint32_t deadline uint32_t deadline
) )
{ {
Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread ); Scheduler_CBS_Node *node;
Scheduler_CBS_Server *serv_info = node->cbs_server; Scheduler_CBS_Server *serv_info;
Priority_Control new_priority;
Priority_Control unused;
if (deadline) { _Scheduler_EDF_Release_job( scheduler, the_thread, deadline );
/* Initializing or shifting deadline. */
if (serv_info) node = _Scheduler_CBS_Thread_get_node( the_thread );
new_priority = (_Watchdog_Ticks_since_boot + serv_info->parameters.deadline) serv_info = node->cbs_server;
& ~SCHEDULER_EDF_PRIO_MSB;
else
new_priority = (_Watchdog_Ticks_since_boot + deadline)
& ~SCHEDULER_EDF_PRIO_MSB;
}
else {
/* Switch back to background priority. */
new_priority = the_thread->Start.initial_priority;
}
/* Budget replenishment for the next job. */ /* Budget replenishment for the next job. */
if (serv_info) if ( serv_info != NULL ) {
the_thread->cpu_time_budget = serv_info->parameters.budget; the_thread->cpu_time_budget = serv_info->parameters.budget;
}
_Thread_Set_priority( the_thread, new_priority, &unused, true );
} }