Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / includes / lunaix / ds / mutex.h

diff --git a/lunaix-os/includes/lunaix/ds/mutex.h b/lunaix-os/includes/lunaix/ds/mutex.h
index 5e166e55ac2456c503e559caaef0b5a19ca193e3..97101ef4ce68090c086fc7d61020964a2e81659b 100644 (file)
--- a/lunaix-os/includes/lunaix/ds/mutex.h
+++ b/lunaix-os/includes/lunaix/ds/mutex.h
@@ -2,25 +2,33 @@
 #define __LUNAIX_MUTEX_H
 
 #include "semaphore.h"
-
-// TODO: implement mutex lock
-
-typedef struct sem_t mutex_t;
-
-static inline void mutex_init(mutex_t *mutex) {
-    sem_init(mutex, 1);
+#include <lunaix/types.h>
+
+typedef struct mutex_s
+{
+    struct sem_t sem;
+    pid_t owner;
+} mutex_t;
+
+static inline void
+mutex_init(mutex_t* mutex)
+{
+    sem_init(&mutex->sem, 1);
 }
 
-static inline unsigned int mutex_on_hold(mutex_t *mutex) {
-    return !atomic_load(&mutex->counter);
+static inline int
+mutex_on_hold(mutex_t* mutex)
+{
+    return !atomic_load(&mutex->sem.counter);
 }
 
-static inline void mutex_lock(mutex_t *mutex) {
-    sem_wait(mutex);
-}
+void
+mutex_lock(mutex_t* mutex);
 
-static inline void mutex_unlock(mutex_t *mutex) {
-    sem_post(mutex);
-}
+void
+mutex_unlock(mutex_t* mutex);
+
+void
+mutex_unlock_for(mutex_t* mutex, pid_t pid);
 
 #endif /* __LUNAIX_MUTEX_H */