From 300f6a481aaf9e6d29811faca71bf7104a01492c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 22 Jun 2016 17:09:23 +0200 Subject: 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. --- cpukit/score/src/schedulercbsreleasejob.c | 40 ++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'cpukit/score/src/schedulercbsreleasejob.c') diff --git a/cpukit/score/src/schedulercbsreleasejob.c b/cpukit/score/src/schedulercbsreleasejob.c index d2169af899..186f95c779 100644 --- a/cpukit/score/src/schedulercbsreleasejob.c +++ b/cpukit/score/src/schedulercbsreleasejob.c @@ -21,10 +21,12 @@ #include -Thread_Control *_Scheduler_CBS_Release_job( +void _Scheduler_CBS_Release_job( const Scheduler_Control *scheduler, Thread_Control *the_thread, - uint64_t deadline + Priority_Node *priority_node, + uint64_t deadline, + Thread_queue_Context *queue_context ) { Scheduler_CBS_Node *node; @@ -38,5 +40,37 @@ Thread_Control *_Scheduler_CBS_Release_job( the_thread->cpu_time_budget = serv_info->parameters.budget; } - return _Scheduler_EDF_Release_job( scheduler, the_thread, deadline ); + node->deadline_node = priority_node; + + _Scheduler_EDF_Release_job( + scheduler, + the_thread, + priority_node, + deadline, + queue_context + ); +} + +void _Scheduler_CBS_Cancel_job( + const Scheduler_Control *scheduler, + Thread_Control *the_thread, + Priority_Node *priority_node, + Thread_queue_Context *queue_context +) +{ + Scheduler_CBS_Node *node; + + node = _Scheduler_CBS_Thread_get_node( the_thread ); + + if ( node->deadline_node != NULL ) { + _Assert( node->deadline_node == priority_node ); + node->deadline_node = NULL; + + _Scheduler_EDF_Cancel_job( + scheduler, + the_thread, + priority_node, + queue_context + ); + } } -- cgit v1.2.3