Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-23 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

posix/src/mutexinit.c: Reorder to make priority a scoped variable

Browse Source
This commit is contained in:
Joel Sherrill
2017-04-27 18:52:01 -05:00
parent c16d45a551
commit 12f9c5b766
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/posix/src/mutexinit.c
+22 -26
View File
@@ -115,35 +115,31 @@ int pthread_mutex_init(
the_mutex->protocol = protocol;
the_mutex->is_recursive = ( the_attr->type == PTHREAD_MUTEX_RECURSIVE );
switch ( protocol ) {
case POSIX_MUTEX_PRIORITY_CEILING: {
int prio_ceiling;
bool valid;
Priority_Control priority;
if ( protocol == POSIX_MUTEX_PRIORITY_CEILING ) {
int prio_ceiling;
bool valid;
Priority_Control priority;
scheduler = _Thread_Scheduler_get_home( _Thread_Get_executing() );
prio_ceiling = the_attr->prio_ceiling;
scheduler = _Thread_Scheduler_get_home( _Thread_Get_executing() );
prio_ceiling = the_attr->prio_ceiling;
if ( prio_ceiling == INT_MAX ) {
prio_ceiling = _POSIX_Priority_Get_maximum( scheduler );
}
priority = _POSIX_Priority_To_core( scheduler, prio_ceiling, &valid );
if ( !valid ) {
_POSIX_Mutex_Free(the_mutex);
_Objects_Allocator_unlock();
return EINVAL;
}
_CORE_ceiling_mutex_Initialize( &the_mutex->Mutex, scheduler, priority );
break;
if ( prio_ceiling == INT_MAX ) {
prio_ceiling = _POSIX_Priority_Get_maximum( scheduler );
}
default:
_Assert(
the_mutex->protocol == POSIX_MUTEX_NO_PROTOCOL
|| the_mutex->protocol == POSIX_MUTEX_PRIORITY_INHERIT
);
_CORE_recursive_mutex_Initialize( &the_mutex->Mutex.Recursive );
break;
priority = _POSIX_Priority_To_core( scheduler, prio_ceiling, &valid );
if ( !valid ) {
_POSIX_Mutex_Free(the_mutex);
_Objects_Allocator_unlock();
return EINVAL;
}
_CORE_ceiling_mutex_Initialize( &the_mutex->Mutex, scheduler, priority );
} else {
_Assert(
the_mutex->protocol == POSIX_MUTEX_NO_PROTOCOL
|| the_mutex->protocol == POSIX_MUTEX_PRIORITY_INHERIT
);
_CORE_recursive_mutex_Initialize( &the_mutex->Mutex.Recursive );
}
_Objects_Open_u32( &_POSIX_Mutex_Information, &the_mutex->Object, 0 );