From a62a3c32b1788f8d1dd318b5e36acc1cf16daf69 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 19 Aug 2014 17:43:36 +0200 Subject: score: PR2179: Fix initially locked PI mutex --- cpukit/score/src/coremutex.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c index 9745f82b7e..261e18e80f 100644 --- a/cpukit/score/src/coremutex.c +++ b/cpukit/score/src/coremutex.c @@ -59,14 +59,19 @@ CORE_mutex_Status _CORE_mutex_Initialize( the_mutex->blocked_count = 0; if ( initial_lock == CORE_MUTEX_LOCKED ) { + bool is_priority_ceiling = + _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ); + the_mutex->nest_count = 1; the_mutex->holder = _Thread_Executing; the_mutex->holder_id = _Thread_Executing->Object.id; - if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) || - _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) { + + if ( is_priority_ceiling || + _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ) { Priority_Control ceiling = the_mutex->Attributes.priority_ceiling; - if ( _Thread_Executing->current_priority < ceiling ) + if ( is_priority_ceiling && + _Thread_Executing->current_priority < ceiling ) return CORE_MUTEX_STATUS_CEILING_VIOLATED; #ifdef __RTEMS_STRICT_ORDER_MUTEX__ _Chain_Prepend_unprotected( &_Thread_Executing->lock_mutex, @@ -75,7 +80,8 @@ CORE_mutex_Status _CORE_mutex_Initialize( #endif _Thread_Executing->resource_count++; - _Thread_Change_priority( _Thread_Executing, ceiling, false ); + if ( is_priority_ceiling ) + _Thread_Change_priority( _Thread_Executing, ceiling, false ); } } else { the_mutex->nest_count = 0; -- cgit v1.2.3