Changeset f6372be9 in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2018-06-26T17:34:23Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

b59318e

Parents:

38e34273

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 20:50:53)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 17:34:23)

Message:

Improve the debugging options for futexes.

File:

• uspace/lib/c/generic/fibril.c (modified) (4 diffs)

uspace/lib/c/generic/fibril.c

@@ -150 +150 @@
         case FIBRIL_FROM_DEAD:
                 /* Make sure the async_futex is held. */
-                assert((atomic_signed_t) async_futex.val.count <= 0);
+                futex_assert_is_locked(&async_futex);
 
                 /* If we are going to manager and none exists, create it */
@@ -162 +162 @@
                     fibril_t, link);
 
+                /* Bookkeeping. */
+                futex_give_to(&async_futex, dstf);
+
                 if (stype == FIBRIL_FROM_DEAD)
                         dstf->clean_after_me = srcf;
@@ -167 +170 @@
         case FIBRIL_PREEMPT:
         case FIBRIL_FROM_MANAGER:
+                futex_assert_is_not_locked(&async_futex);
+
                 if (list_empty(&ready_list)) {
                         futex_unlock(&fibril_futex);
@@ -196 +201 @@
                 break;
         }
+
+        /* Bookkeeping. */
+        futex_give_to(&fibril_futex, dstf);
 
         /* Swap to the next fibril. */