diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-06-22 17:09:23 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-21 08:59:26 +0200 |
commit | 300f6a481aaf9e6d29811faca71bf7104a01492c (patch) | |
tree | ba8f18cedb93e3781a2f17aa989c5c805dd18d6a /cpukit/score/src/schedulercbs.c | |
parent | classic networking: do not reference BSP_irq_enabled_at_i8259s which is no mo... (diff) | |
download | rtems-300f6a481aaf9e6d29811faca71bf7104a01492c.tar.bz2 |
score: Rework thread priority management
Add priority nodes which contribute to the overall thread priority.
The actual priority of a thread is now an aggregation of priority nodes.
The thread priority aggregation for the home scheduler instance of a
thread consists of at least one priority node, which is normally the
real priority of the thread. The locking protocols (e.g. priority
ceiling and priority inheritance), rate-monotonic period objects and the
POSIX sporadic server add, change and remove priority nodes.
A thread changes its priority now immediately, e.g. priority changes are
not deferred until the thread releases its last resource.
Replace the _Thread_Change_priority() function with
* _Thread_Priority_perform_actions(),
* _Thread_Priority_add(),
* _Thread_Priority_remove(),
* _Thread_Priority_change(), and
* _Thread_Priority_update().
Update #2412.
Update #2556.
Diffstat (limited to 'cpukit/score/src/schedulercbs.c')
-rw-r--r-- | cpukit/score/src/schedulercbs.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c index 98ec0eb29e..f114d4fa02 100644 --- a/cpukit/score/src/schedulercbs.c +++ b/cpukit/score/src/schedulercbs.c @@ -19,24 +19,28 @@ #endif #include <rtems/score/schedulercbsimpl.h> -#include <rtems/score/threadimpl.h> -#include <rtems/score/wkspace.h> void _Scheduler_CBS_Budget_callout( Thread_Control *the_thread ) { - Priority_Control new_priority; - Priority_Control unused; - Scheduler_CBS_Node *node; - Scheduler_CBS_Server_id server_id; + Scheduler_CBS_Node *node; + Scheduler_CBS_Server_id server_id; + Thread_queue_Context queue_context; + + node = _Scheduler_CBS_Thread_get_node( the_thread ); /* Put violating task to background until the end of period. */ - new_priority = the_thread->Start.initial_priority; - _Thread_Set_priority( the_thread, new_priority, &unused, true ); + _Thread_queue_Context_clear_priority_updates( &queue_context ); + _Scheduler_CBS_Cancel_job( + NULL, + the_thread, + node->deadline_node, + &queue_context + ); + _Thread_Priority_update( &queue_context ); /* Invoke callback function if any. */ - node = _Scheduler_CBS_Thread_get_node( the_thread ); if ( node->cbs_server->cbs_budget_overrun ) { _Scheduler_CBS_Get_server_id( node->cbs_server->task_id, |