Changeset 55bd76c in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2010-11-05T16:15:52Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9414abc, a66e2993

Parents:

649efcd

Message:

More straightforward use of check_for_deadlock().

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -58 +58 @@
 }
 
-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;
-}
-
 static void print_deadlock(fibril_owner_info_t *oi)
 {
@@ -89 +78 @@
                 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)
@@ -113 +113 @@
                 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 {
@@ -194 +191 @@
                 f->flags &= ~FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
-                
-                if (check_for_deadlock(&frw->oi))
-                        print_deadlock(&frw->oi);
+                check_for_deadlock(&frw->oi);
                 f->waits_for = &frw->oi;
-                
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -220 +214 @@
                 f->flags |= FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
-                
-                if (check_for_deadlock(&frw->oi))
-                        print_deadlock(&frw->oi);
+                check_for_deadlock(&frw->oi);
                 f->waits_for = &frw->oi;
-                
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {