diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-10-31 08:22:02 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-02 10:05:45 +0100 |
commit | 7f7424329eafab755381bc638c2cdddc152a909b (patch) | |
tree | e0daf5ad4cfee57c14c7f2710aabd506a6868033 /cpukit/score/src | |
parent | score: Delete Thread_Scheduler_control::node (diff) | |
download | rtems-7f7424329eafab755381bc638c2cdddc152a909b.tar.bz2 |
score: Delete Thread_Scheduler_control::own_node
Update #2556.
Diffstat (limited to 'cpukit/score/src')
-rw-r--r-- | cpukit/score/src/threadchangepriority.c | 16 | ||||
-rw-r--r-- | cpukit/score/src/threadinitialize.c | 3 | ||||
-rw-r--r-- | cpukit/score/src/threadmp.c | 3 | ||||
-rw-r--r-- | cpukit/score/src/threadqflush.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadqops.c | 10 | ||||
-rw-r--r-- | cpukit/score/src/threadrestart.c | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/cpukit/score/src/threadchangepriority.c b/cpukit/score/src/threadchangepriority.c index 4fd4c02f01..102c9d1fa2 100644 --- a/cpukit/score/src/threadchangepriority.c +++ b/cpukit/score/src/threadchangepriority.c @@ -244,13 +244,13 @@ static void _Thread_Priority_apply( Priority_Action_type priority_action_type ) { - Scheduler_Node *own_node; + Scheduler_Node *scheduler_node; Thread_queue_Queue *queue; - own_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); _Priority_Actions_initialize_one( &queue_context->Priority.Actions, - &own_node->Wait.Priority, + &scheduler_node->Wait.Priority, priority_action_node, priority_action_type ); @@ -326,10 +326,14 @@ void _Thread_Priority_replace( Priority_Node *replacement_node ) { - Scheduler_Node *own_node; + Scheduler_Node *scheduler_node; - own_node = _Thread_Scheduler_get_own_node( the_thread ); - _Priority_Replace( &own_node->Wait.Priority, victim_node, replacement_node ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); + _Priority_Replace( + &scheduler_node->Wait.Priority, + victim_node, + replacement_node + ); } void _Thread_Priority_update( Thread_queue_Context *queue_context ) diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index 37feb372ff..d34cb34313 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -214,7 +214,7 @@ bool _Thread_Initialize( &scheduler_node->Thread.Scheduler_node.Chain ); #else - scheduler_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); _Scheduler_Node_initialize( scheduler, scheduler_node, @@ -234,7 +234,6 @@ bool _Thread_Initialize( RTEMS_STATIC_ASSERT( THREAD_SCHEDULER_BLOCKED == 0, Scheduler_state ); the_thread->Scheduler.own_control = scheduler; the_thread->Scheduler.control = scheduler; - the_thread->Scheduler.own_node = scheduler_node; _ISR_lock_Initialize( &the_thread->Scheduler.Lock, "Thread Scheduler" ); _ISR_lock_Initialize( &the_thread->Wait.Lock.Default, "Thread Wait Default" ); _Thread_queue_Gate_open( &the_thread->Wait.Lock.Tranquilizer ); diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c index 6ff5065e1d..9b3a47710d 100644 --- a/cpukit/score/src/threadmp.c +++ b/cpukit/score/src/threadmp.c @@ -75,9 +75,6 @@ void _Thread_MP_Handler_initialization ( _Thread_Timer_initialize( &proxy->Timer, _Per_CPU_Get_by_index( 0 ) ); _RBTree_Initialize_node( &proxy->Active ); -#if defined(RTEMS_SMP) - proxy->Scheduler.own_node = &proxy->Scheduler_node; -#endif proxy->Scheduler.nodes = &proxy->Scheduler_node; _Scheduler_Node_do_initialize( _Scheduler_Get_by_CPU_index( 0 ), diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c index 9ea82af24a..6c9ca9801b 100644 --- a/cpukit/score/src/threadqflush.c +++ b/cpukit/score/src/threadqflush.c @@ -99,7 +99,7 @@ size_t _Thread_queue_Flush_critical( if ( do_unblock ) { Scheduler_Node *scheduler_node; - scheduler_node = _Thread_Scheduler_get_own_node( first ); + scheduler_node = _Thread_Scheduler_get_home_node( first ); _Chain_Append_unprotected( &unblock, &scheduler_node->Wait.Priority.Node.Node.Chain diff --git a/cpukit/score/src/threadqops.c b/cpukit/score/src/threadqops.c index db22efdbd7..445fc4c835 100644 --- a/cpukit/score/src/threadqops.c +++ b/cpukit/score/src/threadqops.c @@ -142,7 +142,7 @@ static void _Thread_queue_FIFO_do_initialize( { Scheduler_Node *scheduler_node; - scheduler_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); _Chain_Initialize_node( &scheduler_node->Wait.Priority.Node.Node.Chain ); _Chain_Initialize_one( @@ -160,7 +160,7 @@ static void _Thread_queue_FIFO_do_enqueue( { Scheduler_Node *scheduler_node; - scheduler_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); _Chain_Initialize_node( &scheduler_node->Wait.Priority.Node.Node.Chain ); _Chain_Append_unprotected( @@ -182,7 +182,7 @@ static void _Thread_queue_FIFO_do_extract( (void) current_or_previous_owner; (void) queue_context; - scheduler_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); _Chain_Extract_unprotected( &scheduler_node->Wait.Priority.Node.Node.Chain ); } @@ -891,7 +891,7 @@ static void _Thread_queue_Priority_inherit_do_enqueue_change( queue = arg; owner = queue->owner; - scheduler_node_of_owner = _Thread_Scheduler_get_own_node( owner ); + scheduler_node_of_owner = _Thread_Scheduler_get_home_node( owner ); queue_context = THREAD_QUEUE_CONTEXT_OF_PRIORITY_ACTIONS( priority_actions ); _Priority_Actions_initialize_one( @@ -1385,7 +1385,7 @@ static void _Thread_queue_Priority_inherit_do_surrender( fifo_node = _Chain_Next( fifo_node ); } #else - scheduler_node = _Thread_Scheduler_get_own_node( the_thread ); + scheduler_node = _Thread_Scheduler_get_home_node( the_thread ); priority_queue = _Thread_queue_Priority_queue( heads, scheduler_node ); scheduler_node_of_owner = priority_queue->scheduler_node; diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c index 5cd9d43c57..08e3c804b6 100644 --- a/cpukit/score/src/threadrestart.c +++ b/cpukit/score/src/threadrestart.c @@ -170,7 +170,7 @@ static void _Thread_Free( Thread_Control *the_thread ) _ISR_lock_Destroy( &the_thread->Keys.Lock ); _Scheduler_Node_destroy( _Scheduler_Get( the_thread ), - _Thread_Scheduler_get_own_node( the_thread ) + _Thread_Scheduler_get_home_node( the_thread ) ); _ISR_lock_Destroy( &the_thread->Timer.Lock ); |