summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-05-22 09:31:13 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-05-23 09:04:17 +0200
commit272a80b776b862d5432338b39e1e4bcaf74ad4b2 (patch)
treec4507601a794a6a4f7822fbd316b82df121c284e
parentposix: fix race condition between pthread_create and capture engine (diff)
downloadrtems-272a80b776b862d5432338b39e1e4bcaf74ad4b2.tar.bz2
score: PR2179: Fix initially locked PCP mutexes
Elevate the priority of the creating task to the ceiling priority in case a semaphore is created as initially locked.
-rw-r--r--cpukit/score/src/coremutex.c5
-rw-r--r--testsuites/sptests/sp65/init.c35
-rw-r--r--testsuites/sptests/sp65/sp65.doc2
3 files changed, 40 insertions, 2 deletions
diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c
index dcd2e778fe..9745f82b7e 100644
--- a/cpukit/score/src/coremutex.c
+++ b/cpukit/score/src/coremutex.c
@@ -64,9 +64,9 @@ CORE_mutex_Status _CORE_mutex_Initialize(
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 ) ) {
+ Priority_Control ceiling = the_mutex->Attributes.priority_ceiling;
- if ( _Thread_Executing->current_priority <
- the_mutex->Attributes.priority_ceiling )
+ if ( _Thread_Executing->current_priority < ceiling )
return CORE_MUTEX_STATUS_CEILING_VIOLATED;
#ifdef __RTEMS_STRICT_ORDER_MUTEX__
_Chain_Prepend_unprotected( &_Thread_Executing->lock_mutex,
@@ -75,6 +75,7 @@ CORE_mutex_Status _CORE_mutex_Initialize(
#endif
_Thread_Executing->resource_count++;
+ _Thread_Change_priority( _Thread_Executing, ceiling, false );
}
} else {
the_mutex->nest_count = 0;
diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
index 288d4e059b..8d82102117 100644
--- a/testsuites/sptests/sp65/init.c
+++ b/testsuites/sptests/sp65/init.c
@@ -24,6 +24,17 @@ rtems_task Task_1(
rtems_task_argument arg
);
+static void assert_priority(rtems_task_priority expected)
+{
+ rtems_status_code sc;
+ rtems_task_priority prio;
+
+ sc = rtems_task_set_priority(RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &prio);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ rtems_test_assert(prio == expected);
+}
+
rtems_task Init(
rtems_task_argument ignored
)
@@ -34,6 +45,30 @@ rtems_task Init(
puts( "\n\n*** TEST " TEST_NAME " ***" );
/*
+ * Verify that an initially locked priority ceiling mutex elevates the
+ * priority of the creating task.
+ */
+
+ status = rtems_semaphore_create(
+ rtems_build_name( 's','e','m','1' ),
+ 0,
+ RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_PRIORITY_CEILING,
+ 1,
+ &Mutex_id
+ );
+ rtems_test_assert(status == RTEMS_SUCCESSFUL);
+
+ assert_priority(1);
+
+ status = rtems_semaphore_release(Mutex_id);
+ rtems_test_assert(status == RTEMS_SUCCESSFUL);
+
+ assert_priority(TASK_PRIORITY);
+
+ status = rtems_semaphore_delete(Mutex_id);
+ rtems_test_assert(status == RTEMS_SUCCESSFUL);
+
+ /*
* Create binary semaphore (a.k.a. Mutex) with Priority Ceiling
* attribute.
*/
diff --git a/testsuites/sptests/sp65/sp65.doc b/testsuites/sptests/sp65/sp65.doc
index 39a1ee1eef..603adcb211 100644
--- a/testsuites/sptests/sp65/sp65.doc
+++ b/testsuites/sptests/sp65/sp65.doc
@@ -26,3 +26,5 @@ concepts:
+ Verify the priority ceiling mutex getting released which results in a thread
being unblocked and the unblocked thread's priority being elevated.
++ Verify that an initially locked priority ceiling mutex elevates the priority
+ of the creating task.