summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc/monitor
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-27 08:02:03 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-30 16:16:23 +0200
commit5a598ac99b0de720a04afc5e2ac6764117589b90 (patch)
tree811d57df33c0f4fcc1cce61095cb5c0a33eadd7c /cpukit/libmisc/monitor
parentposix: Delete POSIX_Mutex_Protocol::process_shared (diff)
downloadrtems-5a598ac99b0de720a04afc5e2ac6764117589b90.tar.bz2
score: Add CORE mutex variants
Add CORE_recursive_mutex_Control and CORE_ceiling_mutex_Control to avoid the run-time evaluation of attributes to figure out how a particular mutex methods should behave. Start with the no protocol variants. This eliminates the CORE_MUTEX_DISCIPLINES_FIFO and CORE_MUTEX_DISCIPLINES_PRIORITY disciplines.
Diffstat (limited to 'cpukit/libmisc/monitor')
-rw-r--r--cpukit/libmisc/monitor/mon-sema.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c
index 5add7cf06f..bc745294e7 100644
--- a/cpukit/libmisc/monitor/mon-sema.c
+++ b/cpukit/libmisc/monitor/mon-sema.c
@@ -22,7 +22,7 @@ rtems_monitor_sema_canonical(
canonical_sema->attribute = rtems_sema->attribute_set;
canonical_sema->priority_ceiling =
- rtems_sema->Core_control.mutex.Attributes.priority_ceiling;
+ rtems_sema->Core_control.Mutex.priority_ceiling;
canonical_sema->holder_id = 0;
@@ -33,8 +33,9 @@ rtems_monitor_sema_canonical(
}
else {
/* we have a binary semaphore (mutex) */
- Thread_Control *holder = rtems_sema->Core_control.mutex.holder;
+ Thread_Control *holder;
+ holder = rtems_sema->Core_control.Mutex.Recursive.Mutex.holder;
if (holder != NULL) {
canonical_sema->holder_id = holder->Object.id;
canonical_sema->cur_count = 0;