diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-03-27 14:46:31 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-03-31 10:14:42 +0200 |
commit | 03e8928753ef76cb747b965938092c59d6306060 (patch) | |
tree | b97520d3bd562dc50a226b590d8626f2b4e85d19 /cpukit/libmisc/monitor/mon-sema.c | |
parent | score: Delete CORE_mutex_Control::holder_id (diff) | |
download | rtems-03e8928753ef76cb747b965938092c59d6306060.tar.bz2 |
score: Delete CORE_mutex_Control::lock
The holder field is enough to determine if a mutex is locked or not.
This leads also to better error status codes in case a
rtems_semaphore_release() is done for a mutex without having the
ownership.
Diffstat (limited to 'cpukit/libmisc/monitor/mon-sema.c')
-rw-r--r-- | cpukit/libmisc/monitor/mon-sema.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c index df474eafc7..10448663d9 100644 --- a/cpukit/libmisc/monitor/mon-sema.c +++ b/cpukit/libmisc/monitor/mon-sema.c @@ -35,15 +35,17 @@ rtems_monitor_sema_canonical( rtems_sema->Core_control.semaphore.Attributes.maximum_count; } else { + /* we have a binary semaphore (mutex) */ Thread_Control *holder = rtems_sema->Core_control.mutex.holder; if (holder != NULL) { canonical_sema->holder_id = holder->Object.id; + canonical_sema->cur_count = 0; + } else { + canonical_sema->cur_count = 1; } - /* we have a binary semaphore (mutex) */ - canonical_sema->cur_count = rtems_sema->Core_control.mutex.lock; - canonical_sema->max_count = 1; /* mutex is either 0 or 1 */ + canonical_sema->max_count = 1; /* mutex is either 0 or 1 */ } } |