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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (20 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 <stdio.h>
+#include "private/async.h"
 
 static void optimize_execution_power(void)
@@ -55 +56 @@
          */
         if (atomic_get(&threads_in_ipc_wait) > 0)
-                ipc_poke();
-}
-
-static bool check_for_deadlock(fibril_owner_info_t *oi)
-{
-        while (oi && oi->owned_by) {
-                if (oi->owned_by == (fibril_t *) fibril_get_id())
-                        return true;
-                oi = oi->owned_by->waits_for;
-        }
-
-        return false;
+                async_poke();
 }
 
@@ -89 +79 @@
                 oi = oi->owned_by->waits_for;
         }
-
-        abort();
-}
+}
+
+
+static void check_for_deadlock(fibril_owner_info_t *oi)
+{
+        while (oi && oi->owned_by) {
+                if (oi->owned_by == (fibril_t *) fibril_get_id()) {
+                        print_deadlock(oi);
+                        abort();
+                }
+                oi = oi->owned_by->waits_for;
+        }
+}
+
 
 void fibril_mutex_initialize(fibril_mutex_t *fm)
@@ -103 +104 @@
 {
         fibril_t *f = (fibril_t *) fibril_get_id();
+
+        if (fibril_get_sercount() != 0)
+                abort();
 
         futex_down(&async_futex);
@@ -113 +117 @@
                 link_initialize(&wdata.wu_event.link);
                 list_append(&wdata.wu_event.link, &fm->waiters);
-
-                if (check_for_deadlock(&fm->oi))
-                        print_deadlock(&fm->oi);
+                check_for_deadlock(&fm->oi);
                 f->waits_for = &fm->oi;
-
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -142 +143 @@
 static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm)
 {
-        assert(fm->counter <= 0);
         if (fm->counter++ < 0) {
                 link_t *tmp;
@@ -168 +168 @@
 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;
 }
 
@@ -183 +196 @@
 void fibril_rwlock_read_lock(fibril_rwlock_t *frw)
 {
+        fibril_t *f = (fibril_t *) fibril_get_id();
+        
+        if (fibril_get_sercount() != 0)
+                abort();
+
         futex_down(&async_futex);
         if (frw->writers) {
-                fibril_t *f = (fibril_t *) fibril_get_id();
                 awaiter_t wdata;
 
@@ -194 +211 @@
                 f->flags &= ~FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
+                check_for_deadlock(&frw->oi);
+                f->waits_for = &frw->oi;
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
-                frw->readers++;
+                /* Consider the first reader the owner. */
+                if (frw->readers++ == 0)
+                        frw->oi.owned_by = f;
                 futex_up(&async_futex);
         }
@@ -203 +224 @@
 void fibril_rwlock_write_lock(fibril_rwlock_t *frw)
 {
+        fibril_t *f = (fibril_t *) fibril_get_id();
+        
+        if (fibril_get_sercount() != 0)
+                abort();
+
         futex_down(&async_futex);
         if (frw->writers || frw->readers) {
-                fibril_t *f = (fibril_t *) fibril_get_id();
                 awaiter_t wdata;
 
@@ -214 +239 @@
                 f->flags |= FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
+                check_for_deadlock(&frw->oi);
+                f->waits_for = &frw->oi;
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
+                frw->oi.owned_by = f;
                 frw->writers++;
                 futex_up(&async_futex);
@@ -224 +252 @@
 {
         futex_down(&async_futex);
-        assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
-                if (--frw->readers)
+                if (--frw->readers) {
+                        if (frw->oi.owned_by == (fibril_t *) fibril_get_id()) {
+                                /*
+                                 * If this reader firbril was considered the
+                                 * owner of this rwlock, clear the ownership
+                                 * information even if there are still more
+                                 * readers.
+                                 *
+                                 * This is the limitation of the detection
+                                 * mechanism rooted in the fact that tracking
+                                 * all readers would require dynamically
+                                 * allocated memory for keeping linkage info.
+                                 */
+                                frw->oi.owned_by = NULL;
+                        }
                         goto out;
+                }
         } else {
                 frw->writers--;
@@ -233 +275 @@
         
         assert(!frw->readers && !frw->writers);
+        
+        frw->oi.owned_by = NULL;
         
         while (!list_empty(&frw->waiters)) {
@@ -241 +285 @@
                 wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
                 f = (fibril_t *) wdp->fid;
+                
+                f->waits_for = NULL;
                 
                 if (f->flags & FIBRIL_WRITER) {
@@ -250 +296 @@
                         fibril_add_ready(wdp->fid);
                         frw->writers++;
+                        frw->oi.owned_by = f;
                         optimize_execution_power();
                         break;
@@ -257 +304 @@
                         list_remove(&wdp->wu_event.link);
                         fibril_add_ready(wdp->fid);
-                        frw->readers++;
+                        if (frw->readers++ == 0) {
+                                /* Consider the first reader the owner. */
+                                frw->oi.owned_by = f;
+                        }
                         optimize_execution_power();
                 }
@@ -267 +317 @@
 void fibril_rwlock_read_unlock(fibril_rwlock_t *frw)
 {
+        assert(fibril_rwlock_is_read_locked(frw));
         _fibril_rwlock_common_unlock(frw);
 }
@@ -272 +323 @@
 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);
 }
 
@@ -285 +369 @@
 {
         awaiter_t wdata;
+
+        assert(fibril_mutex_is_locked(fm));
 
         if (timeout < 0)