Changeset 899342e in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2018-06-11T18:07:59Z (6 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:

a55d76b1

Parents:

ec39720

Message:

fibril_futex must be locked during context_swap().

File:

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

uspace/lib/c/generic/fibril.c

@@ -72 +72 @@
 static void fibril_main(void)
 {
+        /* fibril_futex is locked when a fibril is first started. */
+        futex_unlock(&fibril_futex);
+
         fibril_t *fibril = __tcb_get()->fibril_data;
 
@@ -211 +214 @@
         }
 
-        futex_unlock(&fibril_futex);
-
 #ifdef FUTEX_UPGRADABLE
         if (stype == FIBRIL_FROM_DEAD) {
@@ -223 +224 @@
 
         /* Restored by another fibril! */
+
+        /* Must be after context_swap()! */
+        futex_unlock(&fibril_futex);
 
         if (srcf->clean_after_me) {