summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-07-08 14:25:55 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-07-08 16:30:48 +0200
commit08d9760daf502d893bc02f24651c7b68287c263c (patch)
tree4c2b37721837fd3e10d252a2d8d81067850ec060
parent19e417678a3d68c5dee3708bf699b1f9e38ff1cb (diff)
downloadrtems-08d9760daf502d893bc02f24651c7b68287c263c.tar.bz2
score: Rename *_Node_get() to *_Thread_get_node()
This emphasizes that the scheduler node of a thread is returned and this is not a function working with scheduler nodes like the other *_Node_*() functions.
-rw-r--r--cpukit/score/include/rtems/score/schedulercbsimpl.h4
-rw-r--r--cpukit/score/include/rtems/score/scheduleredfimpl.h8
-rw-r--r--cpukit/score/include/rtems/score/schedulerimpl.h4
-rw-r--r--cpukit/score/include/rtems/score/schedulerpriorityimpl.h6
-rw-r--r--cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h4
-rw-r--r--cpukit/score/include/rtems/score/schedulersmpimpl.h12
-rw-r--r--cpukit/score/src/schedulercbs.c2
-rw-r--r--cpukit/score/src/schedulercbsattachthread.c2
-rw-r--r--cpukit/score/src/schedulercbsdetachthread.c2
-rw-r--r--cpukit/score/src/schedulercbsnodeinit.c2
-rw-r--r--cpukit/score/src/schedulercbsreleasejob.c2
-rw-r--r--cpukit/score/src/schedulercbsunblock.c2
-rw-r--r--cpukit/score/src/scheduleredfchangepriority.c2
-rw-r--r--cpukit/score/src/scheduleredfnodeinit.c2
-rw-r--r--cpukit/score/src/scheduleredfupdate.c2
-rw-r--r--cpukit/score/src/scheduleredfyield.c2
-rw-r--r--cpukit/score/src/schedulerpriorityaffinitysmp.c12
-rw-r--r--cpukit/score/src/schedulerprioritychangepriority.c2
-rw-r--r--cpukit/score/src/schedulerprioritysmp.c4
-rw-r--r--cpukit/score/src/schedulerpriorityunblock.c2
-rw-r--r--cpukit/score/src/schedulerpriorityupdate.c2
-rw-r--r--cpukit/score/src/schedulerpriorityyield.c2
-rw-r--r--cpukit/score/src/schedulersimplesmp.c4
-rw-r--r--cpukit/score/src/schedulersmpstartidle.c2
-rw-r--r--testsuites/smptests/smpscheduler03/init.c2
25 files changed, 45 insertions, 45 deletions
diff --git a/cpukit/score/include/rtems/score/schedulercbsimpl.h b/cpukit/score/include/rtems/score/schedulercbsimpl.h
index f40de0712e..ddc79fe6da 100644
--- a/cpukit/score/include/rtems/score/schedulercbsimpl.h
+++ b/cpukit/score/include/rtems/score/schedulercbsimpl.h
@@ -36,11 +36,11 @@ extern "C" {
* @{
*/
-RTEMS_INLINE_ROUTINE Scheduler_CBS_Node *_Scheduler_CBS_Node_get(
+RTEMS_INLINE_ROUTINE Scheduler_CBS_Node *_Scheduler_CBS_Thread_get_node(
Thread_Control *the_thread
)
{
- return (Scheduler_CBS_Node *) _Scheduler_Node_get( the_thread );
+ return (Scheduler_CBS_Node *) _Scheduler_Thread_get_node( the_thread );
}
/** @} */
diff --git a/cpukit/score/include/rtems/score/scheduleredfimpl.h b/cpukit/score/include/rtems/score/scheduleredfimpl.h
index d424370a45..aab338edc0 100644
--- a/cpukit/score/include/rtems/score/scheduleredfimpl.h
+++ b/cpukit/score/include/rtems/score/scheduleredfimpl.h
@@ -37,11 +37,11 @@ RTEMS_INLINE_ROUTINE Scheduler_EDF_Context *
return (Scheduler_EDF_Context *) _Scheduler_Get_context( scheduler );
}
-RTEMS_INLINE_ROUTINE Scheduler_EDF_Node *_Scheduler_EDF_Node_get(
+RTEMS_INLINE_ROUTINE Scheduler_EDF_Node *_Scheduler_EDF_Thread_get_node(
Thread_Control *the_thread
)
{
- return (Scheduler_EDF_Node *) _Scheduler_Node_get( the_thread );
+ return (Scheduler_EDF_Node *) _Scheduler_Thread_get_node( the_thread );
}
RTEMS_INLINE_ROUTINE void _Scheduler_EDF_Enqueue(
@@ -51,7 +51,7 @@ RTEMS_INLINE_ROUTINE void _Scheduler_EDF_Enqueue(
{
Scheduler_EDF_Context *context =
_Scheduler_EDF_Get_context( scheduler );
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
_RBTree_Insert( &context->Ready, &node->Node );
node->queue_state = SCHEDULER_EDF_QUEUE_STATE_YES;
@@ -64,7 +64,7 @@ RTEMS_INLINE_ROUTINE void _Scheduler_EDF_Extract(
{
Scheduler_EDF_Context *context =
_Scheduler_EDF_Get_context( scheduler );
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
_RBTree_Extract( &context->Ready, &node->Node );
}
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h
index 391a8d7a85..1a8b6b0f1d 100644
--- a/cpukit/score/include/rtems/score/schedulerimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerimpl.h
@@ -645,8 +645,8 @@ RTEMS_INLINE_ROUTINE uint32_t _Scheduler_Get_index(
return (uint32_t) (scheduler - &_Scheduler_Table[ 0 ]);
}
-RTEMS_INLINE_ROUTINE Scheduler_Node *_Scheduler_Node_get(
- Thread_Control *the_thread
+RTEMS_INLINE_ROUTINE Scheduler_Node *_Scheduler_Thread_get_node(
+ const Thread_Control *the_thread
)
{
return the_thread->Scheduler.node;
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
index 063d4362fe..a1aa779721 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
@@ -41,11 +41,11 @@ RTEMS_INLINE_ROUTINE Scheduler_priority_Context *
return (Scheduler_priority_Context *) _Scheduler_Get_context( scheduler );
}
-RTEMS_INLINE_ROUTINE Scheduler_priority_Node *_Scheduler_priority_Node_get(
+RTEMS_INLINE_ROUTINE Scheduler_priority_Node *_Scheduler_priority_Thread_get_node(
Thread_Control *the_thread
)
{
- return (Scheduler_priority_Node *) _Scheduler_Node_get( the_thread );
+ return (Scheduler_priority_Node *) _Scheduler_Thread_get_node( the_thread );
}
/**
@@ -136,7 +136,7 @@ RTEMS_INLINE_ROUTINE void _Scheduler_priority_Extract_body(
{
Scheduler_priority_Context *context =
_Scheduler_priority_Get_context( scheduler );
- Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
+ Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
_Scheduler_priority_Ready_queue_extract(
&the_thread->Object.Node,
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h b/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
index 86710352e8..9ae01038b6 100644
--- a/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
@@ -44,11 +44,11 @@ static inline Scheduler_priority_SMP_Context *_Scheduler_priority_SMP_Get_self(
return (Scheduler_priority_SMP_Context *) context;
}
-static inline Scheduler_priority_SMP_Node *_Scheduler_priority_SMP_Node_get(
+static inline Scheduler_priority_SMP_Node *_Scheduler_priority_SMP_Thread_get_node(
Thread_Control *thread
)
{
- return (Scheduler_priority_SMP_Node *) _Scheduler_Node_get( thread );
+ return (Scheduler_priority_SMP_Node *) _Scheduler_Thread_get_node( thread );
}
static inline Scheduler_priority_SMP_Node *
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/score/include/rtems/score/schedulersmpimpl.h
index 425dae2942..3ec499b99f 100644
--- a/cpukit/score/include/rtems/score/schedulersmpimpl.h
+++ b/cpukit/score/include/rtems/score/schedulersmpimpl.h
@@ -357,11 +357,11 @@ static inline void _Scheduler_SMP_Initialize(
_Chain_Initialize_empty( &self->Scheduled );
}
-static inline Scheduler_SMP_Node *_Scheduler_SMP_Node_get(
+static inline Scheduler_SMP_Node *_Scheduler_SMP_Thread_get_node(
Thread_Control *thread
)
{
- return (Scheduler_SMP_Node *) _Scheduler_Node_get( thread );
+ return (Scheduler_SMP_Node *) _Scheduler_Thread_get_node( thread );
}
static inline Scheduler_SMP_Node *_Scheduler_SMP_Node_downcast(
@@ -643,7 +643,7 @@ static inline void _Scheduler_SMP_Block(
Scheduler_SMP_Allocate_processor allocate_processor
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
bool is_scheduled = node->state == SCHEDULER_SMP_NODE_SCHEDULED;
_Scheduler_SMP_Node_change_state( node, SCHEDULER_SMP_NODE_BLOCKED );
@@ -669,7 +669,7 @@ static inline void _Scheduler_SMP_Unblock(
Scheduler_SMP_Enqueue enqueue_fifo
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
_Scheduler_SMP_Node_change_state( node, SCHEDULER_SMP_NODE_READY );
@@ -689,7 +689,7 @@ static inline void _Scheduler_SMP_Change_priority(
Scheduler_SMP_Enqueue enqueue_scheduled_lifo
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
if ( node->state == SCHEDULER_SMP_NODE_SCHEDULED ) {
_Scheduler_SMP_Extract_from_scheduled( &node->Base );
@@ -722,7 +722,7 @@ static inline void _Scheduler_SMP_Yield(
Scheduler_SMP_Enqueue enqueue_scheduled_fifo
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
if ( node->state == SCHEDULER_SMP_NODE_SCHEDULED ) {
_Scheduler_SMP_Extract_from_scheduled( &node->Base );
diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c
index e2f34d4c82..44221cdbdf 100644
--- a/cpukit/score/src/schedulercbs.c
+++ b/cpukit/score/src/schedulercbs.c
@@ -38,7 +38,7 @@ void _Scheduler_CBS_Budget_callout(
_Thread_Change_priority(the_thread, new_priority, true);
/* Invoke callback function if any. */
- node = _Scheduler_CBS_Node_get( the_thread );
+ 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,
diff --git a/cpukit/score/src/schedulercbsattachthread.c b/cpukit/score/src/schedulercbsattachthread.c
index 3892e89aae..2d1e0ee243 100644
--- a/cpukit/score/src/schedulercbsattachthread.c
+++ b/cpukit/score/src/schedulercbsattachthread.c
@@ -43,7 +43,7 @@ int _Scheduler_CBS_Attach_thread (
the_thread = _Thread_Get(task_id, &location);
/* The routine _Thread_Get may disable dispatch and not enable again. */
if ( the_thread ) {
- Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
+ Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
/* Thread is already attached to a server. */
if ( node->cbs_server ) {
diff --git a/cpukit/score/src/schedulercbsdetachthread.c b/cpukit/score/src/schedulercbsdetachthread.c
index 6d634ef59f..97ce1ad024 100644
--- a/cpukit/score/src/schedulercbsdetachthread.c
+++ b/cpukit/score/src/schedulercbsdetachthread.c
@@ -42,7 +42,7 @@ int _Scheduler_CBS_Detach_thread (
the_thread = _Thread_Get(task_id, &location);
/* The routine _Thread_Get may disable dispatch and not enable again. */
if ( the_thread ) {
- Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
+ Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
_Scheduler_CBS_Server_list[server_id].task_id = -1;
node->cbs_server = NULL;
diff --git a/cpukit/score/src/schedulercbsnodeinit.c b/cpukit/score/src/schedulercbsnodeinit.c
index b76380fcad..1a5299a863 100644
--- a/cpukit/score/src/schedulercbsnodeinit.c
+++ b/cpukit/score/src/schedulercbsnodeinit.c
@@ -25,7 +25,7 @@ void _Scheduler_CBS_Node_initialize(
Thread_Control *the_thread
)
{
- Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
+ Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
(void) scheduler;
diff --git a/cpukit/score/src/schedulercbsreleasejob.c b/cpukit/score/src/schedulercbsreleasejob.c
index eec930a6c1..36a31551cf 100644
--- a/cpukit/score/src/schedulercbsreleasejob.c
+++ b/cpukit/score/src/schedulercbsreleasejob.c
@@ -29,7 +29,7 @@ void _Scheduler_CBS_Release_job(
uint32_t deadline
)
{
- Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
+ Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
Scheduler_CBS_Server *serv_info = node->cbs_server;
Priority_Control new_priority;
diff --git a/cpukit/score/src/schedulercbsunblock.c b/cpukit/score/src/schedulercbsunblock.c
index 1a374f64a6..5822af2934 100644
--- a/cpukit/score/src/schedulercbsunblock.c
+++ b/cpukit/score/src/schedulercbsunblock.c
@@ -30,7 +30,7 @@ void _Scheduler_CBS_Unblock(
Thread_Control *the_thread
)
{
- Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
+ Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
Scheduler_CBS_Server *serv_info = node->cbs_server;
Priority_Control new_priority;
diff --git a/cpukit/score/src/scheduleredfchangepriority.c b/cpukit/score/src/scheduleredfchangepriority.c
index dfcfef52d1..1422fb174e 100644
--- a/cpukit/score/src/scheduleredfchangepriority.c
+++ b/cpukit/score/src/scheduleredfchangepriority.c
@@ -29,7 +29,7 @@ void _Scheduler_EDF_Change_priority(
{
Scheduler_EDF_Context *context =
_Scheduler_EDF_Get_context( scheduler );
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
_RBTree_Extract( &context->Ready, &node->Node );
_RBTree_Insert( &context->Ready, &node->Node );
diff --git a/cpukit/score/src/scheduleredfnodeinit.c b/cpukit/score/src/scheduleredfnodeinit.c
index 031feb08f2..b23f5acda8 100644
--- a/cpukit/score/src/scheduleredfnodeinit.c
+++ b/cpukit/score/src/scheduleredfnodeinit.c
@@ -25,7 +25,7 @@ void _Scheduler_EDF_Node_initialize(
Thread_Control *the_thread
)
{
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
(void) scheduler;
diff --git a/cpukit/score/src/scheduleredfupdate.c b/cpukit/score/src/scheduleredfupdate.c
index 47e3a705ae..dfa2e81281 100644
--- a/cpukit/score/src/scheduleredfupdate.c
+++ b/cpukit/score/src/scheduleredfupdate.c
@@ -26,7 +26,7 @@ void _Scheduler_EDF_Update_priority(
Priority_Control new_priority
)
{
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
(void) scheduler;
(void) new_priority;
diff --git a/cpukit/score/src/scheduleredfyield.c b/cpukit/score/src/scheduleredfyield.c
index d43448becf..0990ac0b14 100644
--- a/cpukit/score/src/scheduleredfyield.c
+++ b/cpukit/score/src/scheduleredfyield.c
@@ -28,7 +28,7 @@ void _Scheduler_EDF_Yield(
{
Scheduler_EDF_Context *context =
_Scheduler_EDF_Get_context( scheduler );
- Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
+ Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
/*
* The RBTree has more than one node, enqueue behind the tasks
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c
index 49601d5642..e6a662e361 100644
--- a/cpukit/score/src/schedulerpriorityaffinitysmp.c
+++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c
@@ -35,7 +35,7 @@
* + _Scheduler_priority_SMP_Get_self
* + _Scheduler_priority_SMP_Insert_ready_fifo
* + _Scheduler_priority_SMP_Insert_ready_lifo
- * + _Scheduler_priority_SMP_Node_get
+ * + _Scheduler_priority_SMP_Thread_get_node
* + _Scheduler_priority_SMP_Move_from_scheduled_to_ready
* + _Scheduler_priority_SMP_Move_from_ready_to_scheduled
* + _Scheduler_priority_SMP_Extract_from_ready
@@ -65,11 +65,11 @@ static bool _Scheduler_priority_affinity_SMP_Insert_priority_fifo_order(
* as a scheduler specific type.
*/
static Scheduler_priority_affinity_SMP_Node *
-_Scheduler_priority_affinity_SMP_Node_get(
+_Scheduler_priority_affinity_SMP_Thread_get_node(
Thread_Control *thread
)
{
- return (Scheduler_priority_affinity_SMP_Node *) _Scheduler_Node_get( thread );
+ return (Scheduler_priority_affinity_SMP_Node *) _Scheduler_Thread_get_node( thread );
}
static Scheduler_priority_affinity_SMP_Node *
@@ -90,7 +90,7 @@ void _Scheduler_priority_affinity_SMP_Node_initialize(
)
{
Scheduler_priority_affinity_SMP_Node *node =
- _Scheduler_priority_affinity_SMP_Node_get( thread );
+ _Scheduler_priority_affinity_SMP_Thread_get_node( thread );
(void) scheduler;
@@ -541,7 +541,7 @@ bool _Scheduler_priority_affinity_SMP_Get_affinity(
)
{
Scheduler_priority_affinity_SMP_Node *node =
- _Scheduler_priority_affinity_SMP_Node_get(thread);
+ _Scheduler_priority_affinity_SMP_Thread_get_node(thread);
(void) scheduler;
@@ -561,7 +561,7 @@ bool _Scheduler_priority_affinity_SMP_Set_affinity(
)
{
Scheduler_priority_affinity_SMP_Node *node =
- _Scheduler_priority_affinity_SMP_Node_get(thread);
+ _Scheduler_priority_affinity_SMP_Thread_get_node(thread);
(void) scheduler;
diff --git a/cpukit/score/src/schedulerprioritychangepriority.c b/cpukit/score/src/schedulerprioritychangepriority.c
index 91b9fa71a2..4f00af6ad6 100644
--- a/cpukit/score/src/schedulerprioritychangepriority.c
+++ b/cpukit/score/src/schedulerprioritychangepriority.c
@@ -30,7 +30,7 @@ void _Scheduler_priority_Change_priority(
{
Scheduler_priority_Context *context =
_Scheduler_priority_Get_context( scheduler );
- Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
+ Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
_Scheduler_priority_Ready_queue_extract(
&the_thread->Object.Node,
diff --git a/cpukit/score/src/schedulerprioritysmp.c b/cpukit/score/src/schedulerprioritysmp.c
index f74eb1bb82..1f6d608538 100644
--- a/cpukit/score/src/schedulerprioritysmp.c
+++ b/cpukit/score/src/schedulerprioritysmp.c
@@ -47,7 +47,7 @@ void _Scheduler_priority_SMP_Node_initialize(
Thread_Control *thread
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
_Scheduler_SMP_Node_initialize( node, thread );
}
@@ -59,7 +59,7 @@ void _Scheduler_priority_SMP_Update_priority(
)
{
Scheduler_Context *context = _Scheduler_Get_context( scheduler );
- Scheduler_Node *node = _Scheduler_Node_get( thread );
+ Scheduler_Node *node = _Scheduler_Thread_get_node( thread );
_Scheduler_priority_SMP_Do_update( context, node, new_priority );
}
diff --git a/cpukit/score/src/schedulerpriorityunblock.c b/cpukit/score/src/schedulerpriorityunblock.c
index ef46df87e2..c1f12f44c6 100644
--- a/cpukit/score/src/schedulerpriorityunblock.c
+++ b/cpukit/score/src/schedulerpriorityunblock.c
@@ -29,7 +29,7 @@ void _Scheduler_priority_Unblock (
{
Scheduler_priority_Context *context =
_Scheduler_priority_Get_context( scheduler );
- Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
+ Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
_Scheduler_priority_Ready_queue_enqueue(
&the_thread->Object.Node,
diff --git a/cpukit/score/src/schedulerpriorityupdate.c b/cpukit/score/src/schedulerpriorityupdate.c
index 3f05439e42..d2a7e6ccba 100644
--- a/cpukit/score/src/schedulerpriorityupdate.c
+++ b/cpukit/score/src/schedulerpriorityupdate.c
@@ -28,7 +28,7 @@ void _Scheduler_priority_Update_priority(
{
Scheduler_priority_Context *context =
_Scheduler_priority_Get_context( scheduler );
- Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
+ Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
_Scheduler_priority_Ready_queue_update(
&node->Ready_queue,
diff --git a/cpukit/score/src/schedulerpriorityyield.c b/cpukit/score/src/schedulerpriorityyield.c
index 60bab3983e..de4b842513 100644
--- a/cpukit/score/src/schedulerpriorityyield.c
+++ b/cpukit/score/src/schedulerpriorityyield.c
@@ -26,7 +26,7 @@ void _Scheduler_priority_Yield(
Thread_Control *the_thread
)
{
- Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
+ Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
Chain_Control *ready_chain = node->Ready_queue.ready_chain;
(void) scheduler;
diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c
index da2b77a28e..7361678e53 100644
--- a/cpukit/score/src/schedulersimplesmp.c
+++ b/cpukit/score/src/schedulersimplesmp.c
@@ -47,7 +47,7 @@ void _Scheduler_simple_SMP_Node_initialize(
Thread_Control *the_thread
)
{
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( the_thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( the_thread );
_Scheduler_SMP_Node_initialize( node, the_thread );
}
@@ -72,7 +72,7 @@ void _Scheduler_simple_SMP_Update_priority(
)
{
Scheduler_Context *context = _Scheduler_Get_context( scheduler );
- Scheduler_Node *node = _Scheduler_Node_get( thread );
+ Scheduler_Node *node = _Scheduler_Thread_get_node( thread );
_Scheduler_simple_SMP_Do_update( context, node, new_priority );
}
diff --git a/cpukit/score/src/schedulersmpstartidle.c b/cpukit/score/src/schedulersmpstartidle.c
index cb0c2ab706..6809fd81a3 100644
--- a/cpukit/score/src/schedulersmpstartidle.c
+++ b/cpukit/score/src/schedulersmpstartidle.c
@@ -20,7 +20,7 @@ void _Scheduler_SMP_Start_idle(
{
Scheduler_Context *context = _Scheduler_Get_context( scheduler );
Scheduler_SMP_Context *self = _Scheduler_SMP_Get_self( context );
- Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
+ Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
node->state = SCHEDULER_SMP_NODE_SCHEDULED;
diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c
index 4fddc8dc39..a66a6878cf 100644
--- a/testsuites/smptests/smpscheduler03/init.c
+++ b/testsuites/smptests/smpscheduler03/init.c
@@ -114,7 +114,7 @@ static void test_change_priority(void)
_Thread_Disable_dispatch();
executing = _Thread_Executing;
- node = _Scheduler_SMP_Node_get( executing );
+ node = _Scheduler_SMP_Thread_get_node( executing );
for (i = 0; i < RTEMS_ARRAY_SIZE(states); ++i) {
for (j = 0; j < RTEMS_ARRAY_SIZE(priorities); ++j) {