Changes in uspace/lib/c/generic/fibril_synch.c [47b7006:9414abc] in mainline

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (12 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -36 +36 @@
 #include <fibril.h>
 #include <async.h>
+#include <async_priv.h>
 #include <adt/list.h>
 #include <futex.h>
@@ -43 +44 @@
 #include <stacktrace.h>
 #include <stdlib.h>
-#include "private/async.h"
 
 static void optimize_execution_power(void)
@@ -55 +55 @@
          */
         if (atomic_get(&threads_in_ipc_wait) > 0)
-                async_poke();
+                ipc_poke();
 }
 
@@ -104 +104 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
 
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
@@ -142 +139 @@
 static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm)
 {
+        assert(fm->counter <= 0);
         if (fm->counter++ < 0) {
                 link_t *tmp;
@@ -167 +165 @@
 void fibril_mutex_unlock(fibril_mutex_t *fm)
 {
-        assert(fibril_mutex_is_locked(fm));
         futex_down(&async_futex);
         _fibril_mutex_unlock_unsafe(fm);
         futex_up(&async_futex);
-}
-
-bool fibril_mutex_is_locked(fibril_mutex_t *fm)
-{
-        bool locked = false;
-        
-        futex_down(&async_futex);
-        if (fm->counter <= 0) 
-                locked = true;
-        futex_up(&async_futex);
-        
-        return locked;
 }
 
@@ -197 +182 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (frw->writers) {
@@ -225 +207 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (frw->writers || frw->readers) {
@@ -251 +230 @@
 {
         futex_down(&async_futex);
+        assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
                 if (--frw->readers) {
@@ -316 +296 @@
 void fibril_rwlock_read_unlock(fibril_rwlock_t *frw)
 {
-        assert(fibril_rwlock_is_read_locked(frw));
         _fibril_rwlock_common_unlock(frw);
 }
@@ -322 +301 @@
 void fibril_rwlock_write_unlock(fibril_rwlock_t *frw)
 {
-        assert(fibril_rwlock_is_write_locked(frw));
         _fibril_rwlock_common_unlock(frw);
-}
-
-bool fibril_rwlock_is_read_locked(fibril_rwlock_t *frw)
-{
-        bool locked = false;
-
-        futex_down(&async_futex);
-        if (frw->readers)
-                locked = true;
-        futex_up(&async_futex);
-
-        return locked;
-}
-
-bool fibril_rwlock_is_write_locked(fibril_rwlock_t *frw)
-{
-        bool locked = false;
-
-        futex_down(&async_futex);
-        if (frw->writers) {
-                assert(frw->writers == 1);
-                locked = true;
-        }
-        futex_up(&async_futex);
-
-        return locked;
-}
-
-bool fibril_rwlock_is_locked(fibril_rwlock_t *frw)
-{
-        return fibril_rwlock_is_read_locked(frw) ||
-            fibril_rwlock_is_write_locked(frw);
 }
 
@@ -368 +314 @@
 {
         awaiter_t wdata;
-
-        assert(fibril_mutex_is_locked(fm));
 
         if (timeout < 0)