Changeset 08d9760 in rtems


Ignore:
Timestamp:
07/08/14 12:25:55 (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
ac532f3
Parents:
19e41767
git-author:
Sebastian Huber <sebastian.huber@…> (07/08/14 12:25:55)
git-committer:
Sebastian Huber <sebastian.huber@…> (07/08/14 14:30:48)
Message:

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.

Files:
25 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/include/rtems/score/schedulercbsimpl.h

    r19e41767 r08d9760  
    3737 */
    3838
    39 RTEMS_INLINE_ROUTINE Scheduler_CBS_Node *_Scheduler_CBS_Node_get(
     39RTEMS_INLINE_ROUTINE Scheduler_CBS_Node *_Scheduler_CBS_Thread_get_node(
    4040  Thread_Control *the_thread
    4141)
    4242{
    43   return (Scheduler_CBS_Node *) _Scheduler_Node_get( the_thread );
     43  return (Scheduler_CBS_Node *) _Scheduler_Thread_get_node( the_thread );
    4444}
    4545
  • cpukit/score/include/rtems/score/scheduleredfimpl.h

    r19e41767 r08d9760  
    3838}
    3939
    40 RTEMS_INLINE_ROUTINE Scheduler_EDF_Node *_Scheduler_EDF_Node_get(
     40RTEMS_INLINE_ROUTINE Scheduler_EDF_Node *_Scheduler_EDF_Thread_get_node(
    4141  Thread_Control *the_thread
    4242)
    4343{
    44   return (Scheduler_EDF_Node *) _Scheduler_Node_get( the_thread );
     44  return (Scheduler_EDF_Node *) _Scheduler_Thread_get_node( the_thread );
    4545}
    4646
     
    5252  Scheduler_EDF_Context *context =
    5353    _Scheduler_EDF_Get_context( scheduler );
    54   Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
     54  Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
    5555
    5656  _RBTree_Insert( &context->Ready, &node->Node );
     
    6565  Scheduler_EDF_Context *context =
    6666    _Scheduler_EDF_Get_context( scheduler );
    67   Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
     67  Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
    6868
    6969  _RBTree_Extract( &context->Ready, &node->Node );
  • cpukit/score/include/rtems/score/schedulerimpl.h

    r19e41767 r08d9760  
    646646}
    647647
    648 RTEMS_INLINE_ROUTINE Scheduler_Node *_Scheduler_Node_get(
    649   Thread_Control *the_thread
     648RTEMS_INLINE_ROUTINE Scheduler_Node *_Scheduler_Thread_get_node(
     649  const Thread_Control *the_thread
    650650)
    651651{
  • cpukit/score/include/rtems/score/schedulerpriorityimpl.h

    r19e41767 r08d9760  
    4242}
    4343
    44 RTEMS_INLINE_ROUTINE Scheduler_priority_Node *_Scheduler_priority_Node_get(
     44RTEMS_INLINE_ROUTINE Scheduler_priority_Node *_Scheduler_priority_Thread_get_node(
    4545  Thread_Control *the_thread
    4646)
    4747{
    48   return (Scheduler_priority_Node *) _Scheduler_Node_get( the_thread );
     48  return (Scheduler_priority_Node *) _Scheduler_Thread_get_node( the_thread );
    4949}
    5050
     
    137137  Scheduler_priority_Context *context =
    138138    _Scheduler_priority_Get_context( scheduler );
    139   Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
     139  Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
    140140
    141141  _Scheduler_priority_Ready_queue_extract(
  • cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h

    r19e41767 r08d9760  
    4545}
    4646
    47 static inline Scheduler_priority_SMP_Node *_Scheduler_priority_SMP_Node_get(
     47static inline Scheduler_priority_SMP_Node *_Scheduler_priority_SMP_Thread_get_node(
    4848  Thread_Control *thread
    4949)
    5050{
    51   return (Scheduler_priority_SMP_Node *) _Scheduler_Node_get( thread );
     51  return (Scheduler_priority_SMP_Node *) _Scheduler_Thread_get_node( thread );
    5252}
    5353
  • cpukit/score/include/rtems/score/schedulersmpimpl.h

    r19e41767 r08d9760  
    358358}
    359359
    360 static inline Scheduler_SMP_Node *_Scheduler_SMP_Node_get(
     360static inline Scheduler_SMP_Node *_Scheduler_SMP_Thread_get_node(
    361361  Thread_Control *thread
    362362)
    363363{
    364   return (Scheduler_SMP_Node *) _Scheduler_Node_get( thread );
     364  return (Scheduler_SMP_Node *) _Scheduler_Thread_get_node( thread );
    365365}
    366366
     
    644644)
    645645{
    646   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     646  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    647647  bool is_scheduled = node->state == SCHEDULER_SMP_NODE_SCHEDULED;
    648648
     
    670670)
    671671{
    672   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     672  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    673673
    674674  _Scheduler_SMP_Node_change_state( node, SCHEDULER_SMP_NODE_READY );
     
    690690)
    691691{
    692   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     692  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    693693
    694694  if ( node->state == SCHEDULER_SMP_NODE_SCHEDULED ) {
     
    723723)
    724724{
    725   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     725  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    726726
    727727  if ( node->state == SCHEDULER_SMP_NODE_SCHEDULED ) {
  • cpukit/score/src/schedulercbs.c

    r19e41767 r08d9760  
    3939
    4040  /* Invoke callback function if any. */
    41   node = _Scheduler_CBS_Node_get( the_thread );
     41  node = _Scheduler_CBS_Thread_get_node( the_thread );
    4242  if ( node->cbs_server->cbs_budget_overrun ) {
    4343    _Scheduler_CBS_Get_server_id(
  • cpukit/score/src/schedulercbsattachthread.c

    r19e41767 r08d9760  
    4444  /* The routine _Thread_Get may disable dispatch and not enable again. */
    4545  if ( the_thread ) {
    46     Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
     46    Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
    4747
    4848    /* Thread is already attached to a server. */
  • cpukit/score/src/schedulercbsdetachthread.c

    r19e41767 r08d9760  
    4343  /* The routine _Thread_Get may disable dispatch and not enable again. */
    4444  if ( the_thread ) {
    45     Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
     45    Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
    4646
    4747    _Scheduler_CBS_Server_list[server_id].task_id = -1;
  • cpukit/score/src/schedulercbsnodeinit.c

    r19e41767 r08d9760  
    2626)
    2727{
    28   Scheduler_CBS_Node *node = _Scheduler_CBS_Node_get( the_thread );
     28  Scheduler_CBS_Node *node = _Scheduler_CBS_Thread_get_node( the_thread );
    2929
    3030  (void) scheduler;
  • cpukit/score/src/schedulercbsreleasejob.c

    r19e41767 r08d9760  
    3030)
    3131{
    32   Scheduler_CBS_Node   *node = _Scheduler_CBS_Node_get( the_thread );
     32  Scheduler_CBS_Node   *node = _Scheduler_CBS_Thread_get_node( the_thread );
    3333  Scheduler_CBS_Server *serv_info = node->cbs_server;
    3434  Priority_Control      new_priority;
  • cpukit/score/src/schedulercbsunblock.c

    r19e41767 r08d9760  
    3131)
    3232{
    33   Scheduler_CBS_Node   *node = _Scheduler_CBS_Node_get( the_thread );
     33  Scheduler_CBS_Node   *node = _Scheduler_CBS_Thread_get_node( the_thread );
    3434  Scheduler_CBS_Server *serv_info = node->cbs_server;
    3535  Priority_Control      new_priority;
  • cpukit/score/src/scheduleredfchangepriority.c

    r19e41767 r08d9760  
    3030  Scheduler_EDF_Context *context =
    3131    _Scheduler_EDF_Get_context( scheduler );
    32   Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
     32  Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
    3333
    3434  _RBTree_Extract( &context->Ready, &node->Node );
  • cpukit/score/src/scheduleredfnodeinit.c

    r19e41767 r08d9760  
    2626)
    2727{
    28   Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
     28  Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
    2929
    3030  (void) scheduler;
  • cpukit/score/src/scheduleredfupdate.c

    r19e41767 r08d9760  
    2727)
    2828{
    29   Scheduler_EDF_Node *node = _Scheduler_EDF_Node_get( the_thread );
     29  Scheduler_EDF_Node *node = _Scheduler_EDF_Thread_get_node( the_thread );
    3030
    3131  (void) scheduler;
  • cpukit/score/src/scheduleredfyield.c

    r19e41767 r08d9760  
    2929  Scheduler_EDF_Context *context =
    3030    _Scheduler_EDF_Get_context( scheduler );
    31   Scheduler_EDF_Node    *node = _Scheduler_EDF_Node_get( the_thread );
     31  Scheduler_EDF_Node    *node = _Scheduler_EDF_Thread_get_node( the_thread );
    3232
    3333  /*
  • cpukit/score/src/schedulerpriorityaffinitysmp.c

    r19e41767 r08d9760  
    3636 *  + _Scheduler_priority_SMP_Insert_ready_fifo
    3737 *  + _Scheduler_priority_SMP_Insert_ready_lifo
    38  *  + _Scheduler_priority_SMP_Node_get
     38 *  + _Scheduler_priority_SMP_Thread_get_node
    3939 *  + _Scheduler_priority_SMP_Move_from_scheduled_to_ready
    4040 *  + _Scheduler_priority_SMP_Move_from_ready_to_scheduled
     
    6666 */
    6767static Scheduler_priority_affinity_SMP_Node *
    68 _Scheduler_priority_affinity_SMP_Node_get(
     68_Scheduler_priority_affinity_SMP_Thread_get_node(
    6969  Thread_Control *thread
    7070)
    7171{
    72   return (Scheduler_priority_affinity_SMP_Node *) _Scheduler_Node_get( thread );
     72  return (Scheduler_priority_affinity_SMP_Node *) _Scheduler_Thread_get_node( thread );
    7373}
    7474
     
    9191{
    9292  Scheduler_priority_affinity_SMP_Node *node =
    93     _Scheduler_priority_affinity_SMP_Node_get( thread );
     93    _Scheduler_priority_affinity_SMP_Thread_get_node( thread );
    9494
    9595  (void) scheduler;
     
    542542{
    543543  Scheduler_priority_affinity_SMP_Node *node =
    544     _Scheduler_priority_affinity_SMP_Node_get(thread);
     544    _Scheduler_priority_affinity_SMP_Thread_get_node(thread);
    545545
    546546  (void) scheduler;
     
    562562{
    563563  Scheduler_priority_affinity_SMP_Node *node =
    564     _Scheduler_priority_affinity_SMP_Node_get(thread);
     564    _Scheduler_priority_affinity_SMP_Thread_get_node(thread);
    565565
    566566  (void) scheduler;
  • cpukit/score/src/schedulerprioritychangepriority.c

    r19e41767 r08d9760  
    3131  Scheduler_priority_Context *context =
    3232    _Scheduler_priority_Get_context( scheduler );
    33   Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
     33  Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
    3434
    3535  _Scheduler_priority_Ready_queue_extract(
  • cpukit/score/src/schedulerprioritysmp.c

    r19e41767 r08d9760  
    4848)
    4949{
    50   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     50  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    5151
    5252  _Scheduler_SMP_Node_initialize( node, thread );
     
    6060{
    6161  Scheduler_Context *context = _Scheduler_Get_context( scheduler );
    62   Scheduler_Node *node = _Scheduler_Node_get( thread );
     62  Scheduler_Node *node = _Scheduler_Thread_get_node( thread );
    6363
    6464  _Scheduler_priority_SMP_Do_update( context, node, new_priority );
  • cpukit/score/src/schedulerpriorityunblock.c

    r19e41767 r08d9760  
    3030  Scheduler_priority_Context *context =
    3131    _Scheduler_priority_Get_context( scheduler );
    32   Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
     32  Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
    3333
    3434  _Scheduler_priority_Ready_queue_enqueue(
  • cpukit/score/src/schedulerpriorityupdate.c

    r19e41767 r08d9760  
    2929  Scheduler_priority_Context *context =
    3030    _Scheduler_priority_Get_context( scheduler );
    31   Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
     31  Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
    3232
    3333  _Scheduler_priority_Ready_queue_update(
  • cpukit/score/src/schedulerpriorityyield.c

    r19e41767 r08d9760  
    2727)
    2828{
    29   Scheduler_priority_Node *node = _Scheduler_priority_Node_get( the_thread );
     29  Scheduler_priority_Node *node = _Scheduler_priority_Thread_get_node( the_thread );
    3030  Chain_Control *ready_chain = node->Ready_queue.ready_chain;
    3131
  • cpukit/score/src/schedulersimplesmp.c

    r19e41767 r08d9760  
    4848)
    4949{
    50   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( the_thread );
     50  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( the_thread );
    5151
    5252  _Scheduler_SMP_Node_initialize( node, the_thread );
     
    7373{
    7474  Scheduler_Context *context = _Scheduler_Get_context( scheduler );
    75   Scheduler_Node *node = _Scheduler_Node_get( thread );
     75  Scheduler_Node *node = _Scheduler_Thread_get_node( thread );
    7676
    7777  _Scheduler_simple_SMP_Do_update( context, node, new_priority );
  • cpukit/score/src/schedulersmpstartidle.c

    r19e41767 r08d9760  
    2121  Scheduler_Context *context = _Scheduler_Get_context( scheduler );
    2222  Scheduler_SMP_Context *self = _Scheduler_SMP_Get_self( context );
    23   Scheduler_SMP_Node *node = _Scheduler_SMP_Node_get( thread );
     23  Scheduler_SMP_Node *node = _Scheduler_SMP_Thread_get_node( thread );
    2424
    2525  node->state = SCHEDULER_SMP_NODE_SCHEDULED;
  • testsuites/smptests/smpscheduler03/init.c

    r19e41767 r08d9760  
    115115
    116116  executing = _Thread_Executing;
    117   node = _Scheduler_SMP_Node_get( executing );
     117  node = _Scheduler_SMP_Thread_get_node( executing );
    118118
    119119  for (i = 0; i < RTEMS_ARRAY_SIZE(states); ++i) {
Note: See TracChangeset for help on using the changeset viewer.