score: Add _Thread_MP_Extract_proxy()

Remove _Thread_queue_Extract_with_proxy() and move the proxy extraction
to _Thread_MP_Extract_proxy().  Move similar code blocks of the previous
caller of _Thread_queue_Extract_with_proxy() to helper functions.

Update #4546.

1 files changed, 3 insertions, 5 deletions

diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 12a0329a73..d469705d2c 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -137,8 +137,7 @@ static void _Thread_Make_zombie( Thread_Control *the_thread )
   _Objects_Close( &information->Objects, &the_thread->Object );
 
   _Thread_Set_state( the_thread, STATES_ZOMBIE );
-  _Thread_Timer_remove( the_thread );
-  _Thread_queue_Extract_with_proxy( the_thread );
+  _Thread_Timer_remove_and_continue( the_thread );
 
   /*
    * Add the thread to the thread zombie chain before we wake up joining
@@ -358,7 +357,7 @@ static void _Thread_Remove_life_change_request( Thread_Control *the_thread )
      * Do not remove states used for thread queues to avoid race conditions on
      * SMP configurations.  We could interrupt an extract operation on another
      * processor disregarding the thread wait flags.  Rely on
-     * _Thread_queue_Extract_with_proxy() for removal of these states.
+     * _Thread_queue_Extract() for removal of these states.
      */
     _Thread_Clear_state_locked(
       the_thread,
@@ -409,8 +408,7 @@ static void _Thread_Try_life_change_request(
     _Thread_Add_life_change_request( the_thread );
     _Thread_State_release( the_thread, lock_context );
 
-    _Thread_Timer_remove( the_thread );
-    _Thread_queue_Extract_with_proxy( the_thread );
+    _Thread_Timer_remove_and_continue( the_thread );
     _Thread_Remove_life_change_request( the_thread );
   } else {
     _Thread_Clear_state_locked( the_thread, STATES_SUSPENDED );