From 300f6a481aaf9e6d29811faca71bf7104a01492c Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
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/include/rtems/score/thread.h | 53 +++----------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

(limited to 'cpukit/score/include/rtems/score/thread.h')

diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 2cd229f76f..393d431e0e 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -373,7 +373,7 @@ typedef struct {
    *
    * The thread wait lock mechanism protects the following thread variables
    *  - POSIX_API_Control::Attributes,
-   *  - Thread_Control::current_priority,
+   *  - Scheduler_Node::Wait,
    *  - Thread_Control::Wait::Lock::Pending_requests,
    *  - Thread_Control::Wait::queue, and
    *  - Thread_Control::Wait::operations.
@@ -461,32 +461,11 @@ typedef struct {
 
   /** This field is the current execution state of this proxy. */
   States_Control           current_state;
-  /**
-   * @brief This field is the current priority state of this thread.
-   *
-   * Writes to this field are only allowed in _Thread_Initialize() or via
-   * _Thread_Change_priority().
-   */
-  Priority_Control         current_priority;
 
   /**
-   * @brief This field is the base priority of this thread.
-   *
-   * Writes to this field are only allowed in _Thread_Initialize() or via
-   * _Thread_Change_priority().
+   * @brief The base priority of this thread in its home scheduler instance.
    */
-  Priority_Control         real_priority;
-
-  /**
-   * @brief Hints if a priority restore is necessary once the resource count
-   * changes from one to zero.
-   *
-   * This is an optimization to speed up the mutex surrender sequence in case
-   * no attempt to change the priority was made during the mutex ownership.  On
-   * SMP configurations atomic fences must synchronize writes to
-   * Thread_Control::priority_restore_hint and Thread_Control::resource_count.
-   */
-  bool                     priority_restore_hint;
+  Priority_Node            Real_priority;
 
   /** This field is the number of mutexes currently held by this proxy. */
   uint32_t                 resource_count;
@@ -708,31 +687,9 @@ struct _Thread_Control {
   States_Control           current_state;
 
   /**
-   * @brief This field is the current priority state of this thread.
-   *
-   * Writes to this field are only allowed in _Thread_Initialize() or via
-   * _Thread_Change_priority().
-   */
-  Priority_Control         current_priority;
-
-  /**
-   * @brief This field is the base priority of this thread.
-   *
-   * Writes to this field are only allowed in _Thread_Initialize() or via
-   * _Thread_Change_priority().
-   */
-  Priority_Control         real_priority;
-
-  /**
-   * @brief Hints if a priority restore is necessary once the resource count
-   * changes from one to zero.
-   *
-   * This is an optimization to speed up the mutex surrender sequence in case
-   * no attempt to change the priority was made during the mutex ownership.  On
-   * SMP configurations atomic fences must synchronize writes to
-   * Thread_Control::priority_restore_hint and Thread_Control::resource_count.
+   * @brief The base priority of this thread in its home scheduler instance.
    */
-  bool                     priority_restore_hint;
+  Priority_Node            Real_priority;
 
   /** This field is the number of mutexes currently held by this thread. */
   uint32_t                 resource_count;
-- 
cgit v1.2.3