Changeset 08a19ba in mainline for kernel/generic/src/synch

Timestamp:

2008-06-23T18:44:48Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1a1744e

Parents:

deaf8d5

Message:

Support for active mutexes. Active mutexes implement busy waiting, pretty much
in the same way as spinlocks, but can be passed to condition variables, which is
the motivation for this enhancement.

Location:

kernel/generic/src/synch

Files:

• condvar.c (modified) (4 diffs)
• mutex.c (modified) (1 diff)
• rwlock.c (modified) (1 diff)

kernel/generic/src/synch/condvar.c

@@ -44 +44 @@
 /** Initialize condition variable.
  *
- * @param cv Condition variable.
+ * @param cv            Condition variable.
  */
 void condvar_initialize(condvar_t *cv)
@@ -51 +51 @@
 }
 
-/**
- * Signal the condition has become true
- * to the first waiting thread by waking it up.
+/** Signal the condition has become true to the first waiting thread by waking
+ * it up.
  *
- * @param cv Condition variable.
+ * @param cv            Condition variable.
  */
 void condvar_signal(condvar_t *cv)
@@ -62 +61 @@
 }
 
-/**
- * Signal the condition has become true
- * to all waiting threads by waking them up.
+/** Signal the condition has become true to all waiting threads by waking
+ * them up.
  *
- * @param cv Condition variable.
+ * @param cv            Condition variable.
  */
 void condvar_broadcast(condvar_t *cv)
@@ -75 +73 @@
 /** Wait for the condition becoming true.
  *
- * @param cv Condition variable.
- * @param mtx Mutex.
- * @param usec Timeout value in microseconds.
- * @param flags Select mode of operation.
+ * @param cv            Condition variable.
+ * @param mtx           Mutex.
+ * @param usec          Timeout value in microseconds.
+ * @param flags         Select mode of operation.
  *
- * For exact description of meaning of possible combinations
- * of usec and flags, see comment for waitq_sleep_timeout().
- * Note that when SYNCH_FLAGS_NON_BLOCKING is specified here,
- * ESYNCH_WOULD_BLOCK is always returned.
+ * For exact description of meaning of possible combinations of usec and flags,
+ * see comment for waitq_sleep_timeout().  Note that when
+ * SYNCH_FLAGS_NON_BLOCKING is specified here, ESYNCH_WOULD_BLOCK is always
+ * returned.
  *
- * @return See comment for waitq_sleep_timeout().
+ * @return              See comment for waitq_sleep_timeout().
  */
 int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)

kernel/generic/src/synch/mutex.c

@@ -39 +39 @@
 #include <synch/semaphore.h>
 #include <synch/synch.h>
+#include <debug.h>
 
-/** Initialize mutex
+/** Initialize mutex.
  *
- * Initialize mutex.
- *
- * @param mtx Mutex.
+ * @param mtx           Mutex.
+ * @param type          Type of the mutex.
  */
-void mutex_initialize(mutex_t *mtx)
+void mutex_initialize(mutex_t *mtx, mutex_type_t type)
 {
+        mtx->type = type;
         semaphore_initialize(&mtx->sem, 1);
 }
 
-/** Acquire mutex
+/** Acquire mutex.
  *
- * Acquire mutex.
  * Timeout mode and non-blocking mode can be requested.
  *
- * @param mtx Mutex.
- * @param usec Timeout in microseconds.
- * @param flags Specify mode of operation.
+ * @param mtx           Mutex.
+ * @param usec          Timeout in microseconds.
+ * @param flags         Specify mode of operation.
  *
  * For exact description of possible combinations of
  * usec and flags, see comment for waitq_sleep_timeout().
  *
- * @return See comment for waitq_sleep_timeout().
+ * @return              See comment for waitq_sleep_timeout().
  */
 int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, int flags)
 {
-        return _semaphore_down_timeout(&mtx->sem, usec, flags);
+        int rc;
+
+        if (mtx->type == MUTEX_PASSIVE) {
+                rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
+        } else {
+                ASSERT(mtx->type == MUTEX_ACTIVE);
+                ASSERT(usec == SYNCH_NO_TIMEOUT);
+                ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
+                do {
+                        rc = semaphore_trydown(&mtx->sem);
+                } while (SYNCH_FAILED(rc) &&
+                    !(flags & SYNCH_FLAGS_NON_BLOCKING));
+        }
+
+        return rc;
 }
 
-/** Release mutex
+/** Release mutex.
  *
- * Release mutex.
- *
- * @param mtx Mutex.
+ * @param mtx           Mutex.
  */
 void mutex_unlock(mutex_t *mtx)

kernel/generic/src/synch/rwlock.c

@@ -83 +83 @@
 void rwlock_initialize(rwlock_t *rwl) {
         spinlock_initialize(&rwl->lock, "rwlock_t");
-        mutex_initialize(&rwl->exclusive);
+        mutex_initialize(&rwl->exclusive, MUTEX_PASSIVE);
         rwl->readers_in = 0;
 }