RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Joel Sherrill
1996-02-01 22:09:07 +00:00
parent f00a0522a4
commit 4f60309bdd
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
c/src/exec/score/src/coremutex.c
View File

@@ -122,12 +122,6 @@ void _CORE_mutex_Seize(
return;
}
if ( !wait ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
return;
}
if ( _Objects_Are_ids_equal(
_Thread_Executing->Object.id, the_mutex->holder_id ) ) {
if ( _CORE_mutex_Is_nesting_allowed( &the_mutex->Attributes ) )
@@ -139,6 +133,12 @@ void _CORE_mutex_Seize(
return;
}
if ( !wait ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
return;
}
_Thread_queue_Enter_critical_section( &the_mutex->Wait_queue );
executing->Wait.queue = &the_mutex->Wait_queue;
executing->Wait.id = id;

12
cpukit/score/src/coremutex.c
View File

@@ -122,12 +122,6 @@ void _CORE_mutex_Seize(
return;
}
if ( !wait ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
return;
}
if ( _Objects_Are_ids_equal(
_Thread_Executing->Object.id, the_mutex->holder_id ) ) {
if ( _CORE_mutex_Is_nesting_allowed( &the_mutex->Attributes ) )
@@ -139,6 +133,12 @@ void _CORE_mutex_Seize(
return;
}
if ( !wait ) {
_ISR_Enable( level );
executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
return;
}
_Thread_queue_Enter_critical_section( &the_mutex->Wait_queue );
executing->Wait.queue = &the_mutex->Wait_queue;
executing->Wait.id = id;