diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-27 15:41:41 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:16:23 +0200 |
| commit | 33e250c9fa370f620ddbc5850342d5a90b123524 (patch) | |
| tree | a2f4082a58231054f084e9a77aa0af4e3111662d /cpukit/posix/src/mutexinit.c | |
| parent | 5a598ac99b0de720a04afc5e2ac6764117589b90 (diff) | |
score: Rework CORE priority ceiling mutex
Rework seize and surrender methods to use CORE_ceiling_mutex_Control.
This eliminates CORE_mutex_Disciplines.
Diffstat (limited to 'cpukit/posix/src/mutexinit.c')
| -rw-r--r-- | cpukit/posix/src/mutexinit.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cpukit/posix/src/mutexinit.c b/cpukit/posix/src/mutexinit.c index f2912ead18..6c5705b20b 100644 --- a/cpukit/posix/src/mutexinit.c +++ b/cpukit/posix/src/mutexinit.c @@ -119,7 +119,12 @@ int pthread_mutex_init( the_mutex->protocol = protocol; the_mutex->is_recursive = ( the_attr->type == PTHREAD_MUTEX_RECURSIVE ); - if ( protocol == POSIX_MUTEX_NO_PROTOCOL ) { + if ( protocol == POSIX_MUTEX_PRIORITY_CEILING ) { + _CORE_ceiling_mutex_Initialize( + &the_mutex->Mutex, + _POSIX_Priority_To_core( the_attr->prio_ceiling ) + ); + } else if ( protocol == POSIX_MUTEX_NO_PROTOCOL ) { _CORE_recursive_mutex_Initialize( &the_mutex->Mutex.Recursive ); @@ -132,15 +137,6 @@ int pthread_mutex_init( the_mutex_attr.lock_nesting_behavior = CORE_MUTEX_NESTING_IS_ERROR; } - the_mutex_attr.priority_ceiling = - _POSIX_Priority_To_core( the_attr->prio_ceiling ); - - if ( protocol == POSIX_MUTEX_PRIORITY_CEILING ) { - the_mutex_attr.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING; - } else { - the_mutex_attr.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT; - } - /* * Must be initialized to unlocked. */ |