diff options
| author | Gedare Bloom <gedare@rtems.org> | 2017-12-21 11:49:30 -0500 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2018-03-23 11:33:59 -0400 |
| commit | 78b867e26dac3266763f275c1f438da912f33a6e (patch) | |
| tree | 6a6bcac4a0a7f3fa6fd9ab7a9c499ca00ff69f2c /cpukit/libmisc | |
| parent | sptests: Add spmutex01 to build (diff) | |
| download | rtems-78b867e26dac3266763f275c1f438da912f33a6e.tar.bz2 | |
score: replace current and real priority with priority node
Encapsulate the current_priority and real_priority fields of
the thread control block with a Thread_Priority_node struct.
Propagate modifications throughout the tree where the two
fields are directly accessed.
Updates #3359.
Diffstat (limited to 'cpukit/libmisc')
| -rw-r--r-- | cpukit/libmisc/capture/capture.c | 8 | ||||
| -rw-r--r-- | cpukit/libmisc/capture/capture.h | 4 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-task.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index c8a18fc98e..da3e95cc71 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -531,8 +531,8 @@ rtems_capture_record (rtems_capture_task_t* task, */ if ((events & RTEMS_CAPTURE_RECORD_EVENTS) || - ((task->tcb->real_priority >= capture_ceiling) && - (task->tcb->real_priority <= capture_floor) && + ((task->tcb->Priority_node.real_priority >= capture_ceiling) && + (task->tcb->Priority_node.real_priority <= capture_floor) && ((capture_flags & RTEMS_CAPTURE_GLOBAL_WATCH) || (control && (control->flags & RTEMS_CAPTURE_WATCH))))) { @@ -545,8 +545,8 @@ rtems_capture_record (rtems_capture_task_t* task, capture_count++; capture_in->task = task; capture_in->events = (events | - (task->tcb->real_priority) | - (task->tcb->current_priority << 8)); + (task->tcb->Priority_node.real_priority) | + (task->tcb->Priority_node.current_priority << 8)); if ((events & RTEMS_CAPTURE_RECORD_EVENTS) == 0) task->flags |= RTEMS_CAPTURE_TRACED; diff --git a/cpukit/libmisc/capture/capture.h b/cpukit/libmisc/capture/capture.h index 48ba5ebec4..c8ad0d0779 100644 --- a/cpukit/libmisc/capture/capture.h +++ b/cpukit/libmisc/capture/capture.h @@ -711,7 +711,7 @@ static inline rtems_task_priority rtems_capture_task_real_priority (rtems_capture_task_t* task) { if (rtems_capture_task_valid (task)) - return task->tcb->real_priority; + return task->tcb->Priority_node.real_priority; return 0; } @@ -726,7 +726,7 @@ static inline rtems_task_priority rtems_capture_task_curr_priority (rtems_capture_task_t* task) { if (rtems_capture_task_valid (task)) - return task->tcb->current_priority; + return task->tcb->Priority_node.current_priority; return 0; } diff --git a/cpukit/libmisc/monitor/mon-task.c b/cpukit/libmisc/monitor/mon-task.c index 6007b3f879..015ef6ff45 100644 --- a/cpukit/libmisc/monitor/mon-task.c +++ b/cpukit/libmisc/monitor/mon-task.c @@ -29,7 +29,7 @@ rtems_monitor_task_canonical( canonical_task->argument = rtems_thread->Start.numeric_argument; canonical_task->stack = rtems_thread->Start.Initial_stack.area; canonical_task->stack_size = rtems_thread->Start.Initial_stack.size; - canonical_task->priority = rtems_thread->current_priority; + canonical_task->priority = rtems_thread->Priority_node.current_priority; canonical_task->state = rtems_thread->current_state; canonical_task->wait_id = rtems_thread->Wait.id; canonical_task->events = api->pending_events; |