WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/generic/src/synch/ Rev 3185 and /trunk/kernel/generic/src/synch/ Rev 3186

Regard whitespace Rev 3185 → Rev 3186

 /trunk/kernel/generic/src/synch/rwlock.c
 ,7 → 82,7
  */
 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;
 }

 /trunk/kernel/generic/src/synch/mutex.c
 ,21 → 38,21
 #include <synch/mutex.h>
 #include <synch/semaphore.h>
 #include <synch/synch.h>
+#include <debug.h>
-/** Initialize mutex
+/** Initialize mutex.
  *
- * Initialize 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.
 ,13 → 66,25
  */
 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));
 }
-/** Release mutex
+    return rc;
+}
+/** Release mutex.
  *
- * Release mutex.
- *
  * @param mtx Mutex.
  */
 void mutex_unlock(mutex_t *mtx)

 /trunk/kernel/generic/src/synch/condvar.c
 ,9 → 50,8
     waitq_initialize(&cv->wq);
 }
-/**
- * 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.
  */
 ,9 → 60,8
     waitq_wakeup(&cv->wq, WAKEUP_FIRST);
 }
-/**
- * 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.
  */
 ,10 → 77,10
  * @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().
  */