Changes in kernel/generic/include/synch/mutex.h [e88eb48:9f2f5ee] in mainline

File:

• kernel/generic/include/synch/mutex.h (modified) (2 diffs)

kernel/generic/include/synch/mutex.h

@@ -44 +44 @@
         MUTEX_PASSIVE,
         MUTEX_RECURSIVE,
-        MUTEX_ACTIVE
 } mutex_type_t;
 
@@ -51 +50 @@
 typedef struct {
         mutex_type_t type;
+        int nesting;
         semaphore_t sem;
-        struct thread *owner;
-        unsigned nesting;
+        _Atomic(struct thread *) owner;
 } mutex_t;
 
-#define mutex_lock(mtx) \
-        _mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
+#define MUTEX_INITIALIZER(name, mtype) (mutex_t) { \
+        .type = (mtype), \
+        .nesting = 0, \
+        .sem = SEMAPHORE_INITIALIZER((name).sem, 1), \
+        .owner = NULL, \
+}
 
-#define mutex_trylock(mtx) \
-        _mutex_lock_timeout((mtx), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING)
-
-#define mutex_lock_timeout(mtx, usec) \
-        _mutex_lock_timeout((mtx), (usec), SYNCH_FLAGS_NON_BLOCKING)
+#define MUTEX_INITIALIZE(name, mtype) \
+        mutex_t name = MUTEX_INITIALIZER(name, mtype)
 
 extern void mutex_initialize(mutex_t *, mutex_type_t);
 extern bool mutex_locked(mutex_t *);
-extern errno_t _mutex_lock_timeout(mutex_t *, uint32_t, unsigned int);
+extern errno_t mutex_trylock(mutex_t *);
+extern void mutex_lock(mutex_t *);
+extern errno_t mutex_lock_timeout(mutex_t *, uint32_t);
 extern void mutex_unlock(mutex_t *);