Changeset cf2af94 in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

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>
@@ -44 +43 @@
 #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)
-                ipc_poke();
+                async_poke();
 }
 
@@ -103 +103 @@
 {
         fibril_t *f = (fibril_t *) fibril_get_id();
+
+        if (fibril_get_sercount() != 0)
+                abort();
 
         futex_down(&async_futex);
@@ -139 +142 @@
 static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm)
 {
-        assert(fm->counter <= 0);
         if (fm->counter++ < 0) {
                 link_t *tmp;
@@ -165 +167 @@
 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;
 }
 
@@ -182 +197 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
+        if (fibril_get_sercount() != 0)
+                abort();
+
         futex_down(&async_futex);
         if (frw->writers) {
@@ -207 +225 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
+        if (fibril_get_sercount() != 0)
+                abort();
+
         futex_down(&async_futex);
         if (frw->writers || frw->readers) {
@@ -230 +251 @@
 {
         futex_down(&async_futex);
-        assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
                 if (--frw->readers) {
@@ -296 +316 @@
 void fibril_rwlock_read_unlock(fibril_rwlock_t *frw)
 {
+        assert(fibril_rwlock_is_read_locked(frw));
         _fibril_rwlock_common_unlock(frw);
 }
@@ -301 +322 @@
 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);
 }
 
@@ -314 +368 @@
 {
         awaiter_t wdata;
+
+        assert(fibril_mutex_is_locked(fm));
 
         if (timeout < 0)