Changeset 4f60309b in rtems


Ignore:
Timestamp:
Feb 1, 1996, 10:09:07 PM (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
d57392d
Parents:
f00a0522
Message:

Swapped order of nested acquisition check and check for returning unsatisfied.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/src/coremutex.c

    rf00a0522 r4f60309b  
    123123  }
    124124
    125   if ( !wait ) {
    126     _ISR_Enable( level );
    127     executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
    128     return;
    129   }
    130 
    131125  if ( _Objects_Are_ids_equal(
    132126              _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
     
    137131
    138132    _ISR_Enable( level );
     133    return;
     134  }
     135
     136  if ( !wait ) {
     137    _ISR_Enable( level );
     138    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
    139139    return;
    140140  }
  • cpukit/score/src/coremutex.c

    rf00a0522 r4f60309b  
    123123  }
    124124
    125   if ( !wait ) {
    126     _ISR_Enable( level );
    127     executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
    128     return;
    129   }
    130 
    131125  if ( _Objects_Are_ids_equal(
    132126              _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
     
    137131
    138132    _ISR_Enable( level );
     133    return;
     134  }
     135
     136  if ( !wait ) {
     137    _ISR_Enable( level );
     138    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
    139139    return;
    140140  }
Note: See TracChangeset for help on using the changeset viewer.