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

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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.

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -139 +139 @@
 static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm)
 {
-        assert(fm->counter <= 0);
         if (fm->counter++ < 0) {
                 link_t *tmp;
@@ -165 +164 @@
 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;
 }
 
@@ -230 +242 @@
 {
         futex_down(&async_futex);
-        assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
                 if (--frw->readers) {
@@ -296 +307 @@
 void fibril_rwlock_read_unlock(fibril_rwlock_t *frw)
 {
+        assert(fibril_rwlock_is_read_locked(frw));
         _fibril_rwlock_common_unlock(frw);
 }
@@ -301 +313 @@
 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 +359 @@
 {
         awaiter_t wdata;
+
+        assert(fibril_mutex_is_locked(fm));
 
         if (timeout < 0)