Refinement on documentation (#38)

[lunaix-os.git] / lunaix-os / kernel / ds / mutex.c

diff --git a/lunaix-os/kernel/ds/mutex.c b/lunaix-os/kernel/ds/mutex.c
index 6af1087be1859a7755b70c6c2e32f398e01490cb..a27c8db6163f36e91e12c719259fce81e1d17548 100644 (file)
--- a/lunaix-os/kernel/ds/mutex.c
+++ b/lunaix-os/kernel/ds/mutex.c
@@ -1,26 +1,41 @@
 #include <lunaix/ds/mutex.h>
 #include <lunaix/process.h>
 #include <lunaix/ds/mutex.h>
 #include <lunaix/process.h>

+#include <lunaix/kpreempt.h>

 
 

-void
-mutex_lock(mutex_t* mutex)
+static inline bool must_inline
+__mutex_check_owner(mutex_t* mutex)

 {
 {

-    if (atomic_load(&mutex->lk) && mutex->owner == __current->pid) {
-        atomic_fetch_add(&mutex->lk, 1);
-        return;
-    }
+    return mutex->owner == __current->pid;
+}

 
 

+static inline void must_inline
+__mutext_lock(mutex_t* mutex)
+{

     while (atomic_load(&mutex->lk)) {
     while (atomic_load(&mutex->lk)) {

-        sched_yieldk();
+        preempt_current();

     }
 
     atomic_fetch_add(&mutex->lk, 1);
     mutex->owner = __current->pid;
 }
 
     }
 
     atomic_fetch_add(&mutex->lk, 1);
     mutex->owner = __current->pid;
 }
 

+static inline void must_inline
+__mutext_unlock(mutex_t* mutex)
+{
+    if (__mutex_check_owner(mutex))
+        atomic_fetch_sub(&mutex->lk, 1);
+}
+
+void
+mutex_lock(mutex_t* mutex)
+{
+    __mutext_lock(mutex);
+}
+

 void
 mutex_unlock(mutex_t* mutex)
 {
 void
 mutex_unlock(mutex_t* mutex)
 {

-    mutex_unlock_for(mutex, __current->pid);
+    __mutext_unlock(mutex);

 }
 
 void
 }
 
 void


@@ -29,5 +44,22 @@ mutex_unlock_for(mutex_t* mutex, pid_t pid)
     if (mutex->owner != pid || !atomic_load(&mutex->lk)) {
         return;
     }
     if (mutex->owner != pid || !atomic_load(&mutex->lk)) {
         return;
     }

-    atomic_fetch_sub(&mutex->lk, 1);
+    __mutext_unlock(mutex);
+}
+
+void
+mutex_lock_nested(mutex_t* mutex)
+{
+    if (atomic_load(&mutex->lk) && __mutex_check_owner(mutex)) {
+        atomic_fetch_add(&mutex->lk, 1);
+        return;
+    }
+
+    __mutext_lock(mutex);
+}
+
+void
+mutex_unlock_nested(mutex_t* mutex)
+{
+    mutex_unlock_for(mutex, __current->pid);

 }
\ No newline at end of file
 }
\ No newline at end of file