Changeset 66a9239a in rtems


Ignore:
Timestamp:
Jun 30, 2008, 3:03:03 PM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.9, master
Children:
281e95f
Parents:
b4f58efe
Message:

Rename STRICT_ORDER_MUTEX to RTEMS_STRICT_ORDER_MUTEX.

Location:
cpukit
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • cpukit/configure.ac

    rb4f58efe r66a9239a  
    222222
    223223## This gives the same behavior as 4.8 and older
    224 RTEMS_CPUOPT([__STRICT_ORDER_MUTEX__],
     224RTEMS_CPUOPT([__RTEMS_STRICT_ORDER_MUTEX__],
    225225  [test x"${ENABLE_STRICT_ORDER_MUTEX}" = x"1"],
    226226  [1],
  • cpukit/rtems/src/semtranslatereturncode.c

    rb4f58efe r66a9239a  
    6969  RTEMS_OBJECT_WAS_DELETED, /* CORE_MUTEX_WAS_DELETED */
    7070  RTEMS_TIMEOUT,            /* CORE_MUTEX_TIMEOUT */
    71 #ifdef __STRICT_ORDER_MUTEX__
     71#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    7272    CORE_MUTEX_RELEASE_NOT_ORDER,
    7373#endif
  • cpukit/score/include/rtems/score/coremutex.h

    rb4f58efe r66a9239a  
    105105  CORE_MUTEX_TIMEOUT,
    106106
    107 #ifdef __STRICT_ORDER_MUTEX__
     107#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    108108  /** This status indicates that a thread not release the mutex which has
    109109   *  the priority inheritance property in a right order.
     
    194194}   CORE_mutex_Attributes;
    195195
    196 #ifdef __STRICT_ORDER_MUTEX__
     196#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    197197/*@beief Core Mutex Lock_Chain Struct
    198198 *
     
    243243  /** This element contains the object Id of the holding thread.  */
    244244  Objects_Id              holder_id;
    245 #ifdef __STRICT_ORDER_MUTEX__
     245#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    246246  /** This field is used to manipulate the priority inheritance mutex queue*/
    247247  CORE_mutex_order_list   queue;
  • cpukit/score/include/rtems/score/thread.h

    rb4f58efe r66a9239a  
    317317  MP_packet_Prefix        *receive_packet;
    318318#endif
    319 #ifdef __STRICT_ORDER_MUTEX__
     319#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    320320  /**This field is the head of queue of priority inheritance mutex holed by the thread*/
    321321  Chain_Control            lock_mutex;
  • cpukit/score/inline/rtems/score/coremutex.inl

    rb4f58efe r66a9239a  
    141141         _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ){
    142142
    143 #ifdef __STRICT_ORDER_MUTEX__
     143#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    144144       _Chain_Prepend_unprotected( &executing->lock_mutex,
    145145                                   &the_mutex->queue.lock_queue );
  • cpukit/score/src/coremutex.c

    rb4f58efe r66a9239a  
    6666         _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) )
    6767     
    68 #ifdef __STRICT_ORDER_MUTEX__
     68#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    6969       _Chain_Prepend_unprotected( &executing->lock_mutex,
    7070                                   &the_mutex->queue.lock_queue );
  • cpukit/score/src/coremutexsurrender.c

    rb4f58efe r66a9239a  
    5555  Thread_Control *the_thread;
    5656  Thread_Control *holder;
    57 #ifdef __STRICT_ORDER_MUTEX__
     57#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    5858  Chain_Node *first_node;
    5959#endif
     
    9999  if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ||
    100100       _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ){
    101 #ifdef __STRICT_ORDER_MUTEX__
     101#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    102102    /*Check whether the holder release the mutex in LIFO order
    103103      if not return error code*/
     
    120120  if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ||
    121121       _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) {
    122 #ifdef __STRICT_ORDER_MUTEX__
     122#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    123123    if(the_mutex->queue.priority_before != holder->current_priority)
    124124      _Thread_Change_priority(holder,the_mutex->queue.priority_before,TRUE);
     
    158158          break;
    159159        case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
    160 #ifdef __STRICT_ORDER_MUTEX__
     160#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    161161          _Chain_Prepend_unprotected(&the_thread->lock_mutex,&the_mutex->queue.lock_queue);
    162162          the_mutex->queue.priority_before = the_thread->current_priority;
     
    165165          break;
    166166        case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
    167 #ifdef __STRICT_ORDER_MUTEX__
     167#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    168168          _Chain_Prepend_unprotected(&the_thread->lock_mutex,&the_mutex->queue.lock_queue);
    169169          the_mutex->queue.priority_before = the_thread->current_priority;
  • cpukit/score/src/threadinitialize.c

    rb4f58efe r66a9239a  
    124124  _Watchdog_Initialize( &the_thread->Timer, NULL, 0, NULL );
    125125
    126 #ifdef __STRICT_ORDER_MUTEX__
     126#ifdef __RTEMS_STRICT_ORDER_MUTEX__
    127127  /*Initialize the head of chain of mutex */
    128128  _Chain_Initialize_empty(&the_thread->lock_mutex);
Note: See TracChangeset for help on using the changeset viewer.