score: Rename scheduler ask for help stuff

Rename the scheduler ask for help stuff since this will be replaced step
by step with a second generation of the scheduler helping protocol.
Keep the old one for now in parallel to reduce the patch set sizes.

Update #2556.

13 files changed, 28 insertions, 28 deletions

diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index b934269188..e85b7f8c34 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -114,9 +114,9 @@ typedef struct {
    * @retval NULL It was possible to schedule the thread needing help, and no
    *   other thread needs help as a result.
    *
-   * @see _Scheduler_Ask_for_help().
+   * @see _Scheduler_Ask_for_help_X().
    */
-  Thread_Control *( *ask_for_help )(
+  Thread_Control *( *ask_for_help_X )(
     const Scheduler_Control *scheduler,
     Thread_Control          *offers_help,
     Thread_Control          *needs_help
@@ -323,14 +323,14 @@ Priority_Control _Scheduler_default_Map_priority(
    *
    * @retval NULL Always.
    */
-  Thread_Control *_Scheduler_default_Ask_for_help(
+  Thread_Control *_Scheduler_default_Ask_for_help_X(
     const Scheduler_Control *scheduler,
     Thread_Control          *offers_help,
     Thread_Control          *needs_help
   );
 
   #define SCHEDULER_OPERATION_DEFAULT_ASK_FOR_HELP \
-    _Scheduler_default_Ask_for_help,
+    _Scheduler_default_Ask_for_help_X,
 #else
   #define SCHEDULER_OPERATION_DEFAULT_ASK_FOR_HELP
 #endif
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h
index 7ac8964909..e44dd4fbbb 100644
--- a/cpukit/score/include/rtems/score/schedulerimpl.h
+++ b/cpukit/score/include/rtems/score/schedulerimpl.h
@@ -191,7 +191,7 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Ask_for_help_visitor(
     THREAD_RESOURCE_NODE_TO_THREAD( resource_node );
   const Scheduler_Control *scheduler = _Scheduler_Get_own( offers_help );
 
-  next_needs_help = ( *scheduler->Operations.ask_for_help )(
+  next_needs_help = ( *scheduler->Operations.ask_for_help_X )(
     scheduler,
     offers_help,
     previous_needs_help
@@ -219,14 +219,14 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Ask_for_help_visitor(
  *
  * @param[in] needs_help The thread needing help.
  */
-RTEMS_INLINE_ROUTINE void _Scheduler_Ask_for_help(
+RTEMS_INLINE_ROUTINE void _Scheduler_Ask_for_help_X(
   Thread_Control *needs_help
 )
 {
   do {
     const Scheduler_Control *scheduler = _Scheduler_Get_own( needs_help );
 
-    needs_help = ( *scheduler->Operations.ask_for_help )(
+    needs_help = ( *scheduler->Operations.ask_for_help_X )(
       scheduler,
       needs_help,
       needs_help
@@ -260,7 +260,7 @@ RTEMS_INLINE_ROUTINE void _Scheduler_Ask_for_help_if_necessary(
       node->help_state != SCHEDULER_HELP_ACTIVE_RIVAL
         || _Scheduler_Node_get_user( node ) != needs_help
     ) {
-      _Scheduler_Ask_for_help( needs_help );
+      _Scheduler_Ask_for_help_X( needs_help );
     }
   }
 }
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h b/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h
index 317411ad7b..4d06bcb43a 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h
+++ b/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h
@@ -57,7 +57,7 @@ extern "C" {
     _Scheduler_priority_affinity_SMP_Update_priority, \
     _Scheduler_default_Map_priority, \
     _Scheduler_default_Unmap_priority, \
-    _Scheduler_priority_affinity_SMP_Ask_for_help, \
+    _Scheduler_priority_affinity_SMP_Ask_for_help_X, \
     _Scheduler_priority_affinity_SMP_Node_initialize, \
     _Scheduler_default_Node_destroy, \
     _Scheduler_default_Release_job, \
@@ -141,7 +141,7 @@ Thread_Control *_Scheduler_priority_affinity_SMP_Update_priority(
   Thread_Control          *the_thread
 );
 
-Thread_Control *_Scheduler_priority_affinity_SMP_Ask_for_help(
+Thread_Control *_Scheduler_priority_affinity_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmp.h b/cpukit/score/include/rtems/score/schedulerprioritysmp.h
index 6ae933f3f7..4bd779557f 100644
--- a/cpukit/score/include/rtems/score/schedulerprioritysmp.h
+++ b/cpukit/score/include/rtems/score/schedulerprioritysmp.h
@@ -86,7 +86,7 @@ typedef struct {
     _Scheduler_priority_SMP_Update_priority, \
     _Scheduler_default_Map_priority, \
     _Scheduler_default_Unmap_priority, \
-    _Scheduler_priority_SMP_Ask_for_help, \
+    _Scheduler_priority_SMP_Ask_for_help_X, \
     _Scheduler_priority_SMP_Node_initialize, \
     _Scheduler_default_Node_destroy, \
     _Scheduler_default_Release_job, \
@@ -120,7 +120,7 @@ Thread_Control *_Scheduler_priority_SMP_Update_priority(
   Thread_Control          *the_thread
 );
 
-Thread_Control *_Scheduler_priority_SMP_Ask_for_help(
+Thread_Control *_Scheduler_priority_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *needs_help,
   Thread_Control          *offers_help
diff --git a/cpukit/score/include/rtems/score/schedulersimplesmp.h b/cpukit/score/include/rtems/score/schedulersimplesmp.h
index 95176dc2c1..6d2b77c2e9 100644
--- a/cpukit/score/include/rtems/score/schedulersimplesmp.h
+++ b/cpukit/score/include/rtems/score/schedulersimplesmp.h
@@ -69,7 +69,7 @@ typedef struct {
     _Scheduler_simple_SMP_Update_priority, \
     _Scheduler_default_Map_priority, \
     _Scheduler_default_Unmap_priority, \
-    _Scheduler_simple_SMP_Ask_for_help, \
+    _Scheduler_simple_SMP_Ask_for_help_X, \
     _Scheduler_simple_SMP_Node_initialize, \
     _Scheduler_default_Node_destroy, \
     _Scheduler_default_Release_job, \
@@ -103,7 +103,7 @@ Thread_Control *_Scheduler_simple_SMP_Update_priority(
   Thread_Control          *the_thread
 );
 
-Thread_Control *_Scheduler_simple_SMP_Ask_for_help(
+Thread_Control *_Scheduler_simple_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/score/include/rtems/score/schedulersmpimpl.h
index 55c3c78a9b..4e4edf75a1 100644
--- a/cpukit/score/include/rtems/score/schedulersmpimpl.h
+++ b/cpukit/score/include/rtems/score/schedulersmpimpl.h
@@ -1013,7 +1013,7 @@ static inline Thread_Control *_Scheduler_SMP_Update_priority(
   return needs_help;
 }
 
-static inline Thread_Control *_Scheduler_SMP_Ask_for_help(
+static inline Thread_Control *_Scheduler_SMP_Ask_for_help_X(
   Scheduler_Context                  *context,
   Thread_Control                     *offers_help,
   Thread_Control                     *needs_help,
diff --git a/cpukit/score/include/rtems/score/schedulerstrongapa.h b/cpukit/score/include/rtems/score/schedulerstrongapa.h
index 2cc91835b2..4dfc2ff2c8 100644
--- a/cpukit/score/include/rtems/score/schedulerstrongapa.h
+++ b/cpukit/score/include/rtems/score/schedulerstrongapa.h
@@ -86,7 +86,7 @@ typedef struct {
     _Scheduler_strong_APA_Update_priority, \
     _Scheduler_default_Map_priority, \
     _Scheduler_default_Unmap_priority, \
-    _Scheduler_strong_APA_Ask_for_help, \
+    _Scheduler_strong_APA_Ask_for_help_X, \
     _Scheduler_strong_APA_Node_initialize, \
     _Scheduler_default_Node_destroy, \
     _Scheduler_default_Release_job, \
@@ -120,7 +120,7 @@ Thread_Control *_Scheduler_strong_APA_Update_priority(
   Thread_Control          *the_thread
 );
 
-Thread_Control *_Scheduler_strong_APA_Ask_for_help(
+Thread_Control *_Scheduler_strong_APA_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *needs_help,
   Thread_Control          *offers_help
diff --git a/cpukit/score/src/schedulerchangeroot.c b/cpukit/score/src/schedulerchangeroot.c
index d036fd8a8b..7cddb04eb0 100644
--- a/cpukit/score/src/schedulerchangeroot.c
+++ b/cpukit/score/src/schedulerchangeroot.c
@@ -38,7 +38,7 @@ RTEMS_INLINE_ROUTINE bool _Scheduler_Set_root_visitor(
 
   _Resource_Node_set_root( resource_node, &root->Resource_node );
 
-  needs_help_too = ( *scheduler->Operations.ask_for_help )(
+  needs_help_too = ( *scheduler->Operations.ask_for_help_X )(
     scheduler,
     offers_help,
     needs_help
@@ -75,6 +75,6 @@ void _Scheduler_Thread_change_resource_root(
   _Resource_Iterate( &top->Resource_node, _Scheduler_Set_root_visitor, &ctx );
 
   if ( ctx.needs_help != NULL ) {
-    _Scheduler_Ask_for_help( ctx.needs_help );
+    _Scheduler_Ask_for_help_X( ctx.needs_help );
   }
 }
diff --git a/cpukit/score/src/schedulerdefaultaskforhelp.c b/cpukit/score/src/schedulerdefaultaskforhelp.c
index b69524846b..dd60d44d25 100644
--- a/cpukit/score/src/schedulerdefaultaskforhelp.c
+++ b/cpukit/score/src/schedulerdefaultaskforhelp.c
@@ -12,7 +12,7 @@
 
 #include <rtems/score/scheduler.h>
 
-Thread_Control *_Scheduler_default_Ask_for_help(
+Thread_Control *_Scheduler_default_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c
index 9565af28df..a15ff0f2f2 100644
--- a/cpukit/score/src/schedulerpriorityaffinitysmp.c
+++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c
@@ -525,7 +525,7 @@ Thread_Control *_Scheduler_priority_affinity_SMP_Update_priority(
   return displaced;
 }
 
-Thread_Control *_Scheduler_priority_affinity_SMP_Ask_for_help(
+Thread_Control *_Scheduler_priority_affinity_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
@@ -533,7 +533,7 @@ Thread_Control *_Scheduler_priority_affinity_SMP_Ask_for_help(
 {
   Scheduler_Context *context = _Scheduler_Get_context( scheduler );
 
-  needs_help = _Scheduler_SMP_Ask_for_help(
+  needs_help = _Scheduler_SMP_Ask_for_help_X(
     context,
     offers_help,
     needs_help,
diff --git a/cpukit/score/src/schedulerprioritysmp.c b/cpukit/score/src/schedulerprioritysmp.c
index e624a6acf4..2445503485 100644
--- a/cpukit/score/src/schedulerprioritysmp.c
+++ b/cpukit/score/src/schedulerprioritysmp.c
@@ -244,7 +244,7 @@ Thread_Control *_Scheduler_priority_SMP_Update_priority(
   );
 }
 
-Thread_Control *_Scheduler_priority_SMP_Ask_for_help(
+Thread_Control *_Scheduler_priority_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
@@ -252,7 +252,7 @@ Thread_Control *_Scheduler_priority_SMP_Ask_for_help(
 {
   Scheduler_Context *context = _Scheduler_Get_context( scheduler );
 
-  return _Scheduler_SMP_Ask_for_help(
+  return _Scheduler_SMP_Ask_for_help_X(
     context,
     offers_help,
     needs_help,
diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c
index 9606896a94..f51990e9c7 100644
--- a/cpukit/score/src/schedulersimplesmp.c
+++ b/cpukit/score/src/schedulersimplesmp.c
@@ -311,7 +311,7 @@ Thread_Control *_Scheduler_simple_SMP_Update_priority(
   );
 }
 
-Thread_Control *_Scheduler_simple_SMP_Ask_for_help(
+Thread_Control *_Scheduler_simple_SMP_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
@@ -319,7 +319,7 @@ Thread_Control *_Scheduler_simple_SMP_Ask_for_help(
 {
   Scheduler_Context *context = _Scheduler_Get_context( scheduler );
 
-  return _Scheduler_SMP_Ask_for_help(
+  return _Scheduler_SMP_Ask_for_help_X(
     context,
     offers_help,
     needs_help,
diff --git a/cpukit/score/src/schedulerstrongapa.c b/cpukit/score/src/schedulerstrongapa.c
index fc6d0125e7..7dfe0759b8 100644
--- a/cpukit/score/src/schedulerstrongapa.c
+++ b/cpukit/score/src/schedulerstrongapa.c
@@ -370,7 +370,7 @@ Thread_Control *_Scheduler_strong_APA_Update_priority(
   );
 }
 
-Thread_Control *_Scheduler_strong_APA_Ask_for_help(
+Thread_Control *_Scheduler_strong_APA_Ask_for_help_X(
   const Scheduler_Control *scheduler,
   Thread_Control          *offers_help,
   Thread_Control          *needs_help
@@ -378,7 +378,7 @@ Thread_Control *_Scheduler_strong_APA_Ask_for_help(
 {
   Scheduler_Context *context = _Scheduler_Get_context( scheduler );
 
-  return _Scheduler_SMP_Ask_for_help(
+  return _Scheduler_SMP_Ask_for_help_X(
     context,
     offers_help,
     needs_help,