Changeset 3d0c4005 in rtems


Ignore:
Timestamp:
Apr 19, 2016, 1:07:39 PM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
cca2d8ab
Parents:
242a05a
git-author:
Sebastian Huber <sebastian.huber@…> (04/19/16 13:07:39)
git-committer:
Sebastian Huber <sebastian.huber@…> (04/21/16 05:29:40)
Message:

score: Rename _CORE_barrier_Wait()

Rename _CORE_barrier_Wait() into _CORE_barrier_Seize(). Rename
_CORE_barrier_Release() into _CORE_barrier_Surrender(). This avoids
confusion with the ISR lock acquire and release.

Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/posix/src/pbarrierwait.c

    r242a05a r3d0c4005  
    5353    case OBJECTS_LOCAL:
    5454      executing = _Thread_Executing;
    55       _CORE_barrier_Wait(
     55      _CORE_barrier_Seize(
    5656        &the_barrier->Barrier,
    5757        executing,
  • cpukit/rtems/src/barrierrelease.c

    r242a05a r3d0c4005  
    5555
    5656    case OBJECTS_LOCAL:
    57       *released = _CORE_barrier_Release( &the_barrier->Barrier, NULL, 0 );
     57      *released = _CORE_barrier_Surrender( &the_barrier->Barrier, NULL, 0 );
    5858      _Objects_Put( &the_barrier->Object );
    5959      return RTEMS_SUCCESSFUL;
  • cpukit/rtems/src/barrierwait.c

    r242a05a r3d0c4005  
    4141    case OBJECTS_LOCAL:
    4242      executing = _Thread_Executing;
    43       _CORE_barrier_Wait(
     43      _CORE_barrier_Seize(
    4444        &the_barrier->Barrier,
    4545        executing,
  • cpukit/score/include/rtems/score/corebarrierimpl.h

    r242a05a r3d0c4005  
    8585}
    8686
    87 void _CORE_barrier_Do_wait(
     87void _CORE_barrier_Do_seize(
    8888  CORE_barrier_Control    *the_barrier,
    8989  Thread_Control          *executing,
     
    117117 */
    118118#if defined(RTEMS_MULTIPROCESSING)
    119   #define _CORE_barrier_Wait( \
     119  #define _CORE_barrier_Seize( \
    120120    the_barrier, \
    121121    executing, \
     
    125125    mp_id \
    126126  ) \
    127     _CORE_barrier_Do_wait( \
     127    _CORE_barrier_Do_seize( \
    128128      the_barrier, \
    129129      executing, \
     
    134134    )
    135135#else
    136   #define _CORE_barrier_Wait( \
     136  #define _CORE_barrier_Seize( \
    137137    the_barrier, \
    138138    executing, \
     
    142142    mp_id \
    143143  ) \
    144     _CORE_barrier_Do_wait( \
     144    _CORE_barrier_Do_seize( \
    145145      the_barrier, \
    146146      executing, \
     
    150150#endif
    151151
    152 uint32_t _CORE_barrier_Do_release(
     152uint32_t _CORE_barrier_Do_surrender(
    153153  CORE_barrier_Control    *the_barrier
    154154#if defined(RTEMS_MULTIPROCESSING)
     
    173173 */
    174174#if defined(RTEMS_MULTIPROCESSING)
    175   #define _CORE_barrier_Release( \
    176     the_barrier, \
    177     mp_callout, \
    178     mp_id \
    179   ) \
    180     _CORE_barrier_Do_release( \
     175  #define _CORE_barrier_Surrender( \
     176    the_barrier, \
     177    mp_callout, \
     178    mp_id \
     179  ) \
     180    _CORE_barrier_Do_surrender( \
    181181      the_barrier, \
    182182      mp_callout, \
     
    184184    )
    185185#else
    186   #define _CORE_barrier_Release( \
    187     the_barrier, \
    188     mp_callout, \
    189     mp_id \
    190   ) \
    191     _CORE_barrier_Do_release( \
     186  #define _CORE_barrier_Surrender( \
     187    the_barrier, \
     188    mp_callout, \
     189    mp_id \
     190  ) \
     191    _CORE_barrier_Do_surrender( \
    192192      the_barrier \
    193193    )
  • cpukit/score/src/corebarrierrelease.c

    r242a05a r3d0c4005  
    2424#include <rtems/score/threadqimpl.h>
    2525
    26 uint32_t _CORE_barrier_Do_release(
     26uint32_t _CORE_barrier_Do_surrender(
    2727  CORE_barrier_Control    *the_barrier
    2828#if defined(RTEMS_MULTIPROCESSING)
  • cpukit/score/src/corebarrierwait.c

    r242a05a r3d0c4005  
    2424#include <rtems/score/threadqimpl.h>
    2525
    26 void _CORE_barrier_Do_wait(
     26void _CORE_barrier_Do_seize(
    2727  CORE_barrier_Control    *the_barrier,
    2828  Thread_Control          *executing,
     
    4646      executing->Wait.return_code = CORE_BARRIER_STATUS_AUTOMATICALLY_RELEASED;
    4747      _Thread_queue_Release( &the_barrier->Wait_queue, &lock_context );
    48       _CORE_barrier_Release( the_barrier, mp_callout, mp_id );
     48      _CORE_barrier_Surrender( the_barrier, mp_callout, mp_id );
    4949      return;
    5050    }
Note: See TracChangeset for help on using the changeset viewer.