Changes in uspace/lib/c/generic/fibril.c [2654afb:6aeca0d] in mainline

File:

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

uspace/lib/c/generic/fibril.c

@@ -49 +49 @@
 #include <assert.h>
 #include <async.h>
-#include <futex.h>
 
 #ifdef FUTEX_UPGRADABLE
@@ -115 +114 @@
         fibril->waits_for = NULL;
 
-        futex_lock(&fibril_futex);
+        fibril->switches = 0;
+
+        /*
+         * We are called before __tcb_set(), so we need to use
+         * futex_down/up() instead of futex_lock/unlock() that
+         * may attempt to access TLS.
+         */
+        futex_down(&fibril_futex);
         list_append(&fibril->all_link, &fibril_list);
-        futex_unlock(&fibril_futex);
+        futex_up(&fibril_futex);
         
         return fibril;
@@ -212 +218 @@
                         assert(stype == FIBRIL_TO_MANAGER);
 
+                        srcf->switches++;
+
                         /*
                          * Don't put the current fibril into any list, it should
@@ -271 +279 @@
         size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ?
             stack_size_get() : stksz;
-        fibril->stack = as_area_create((void *) -1, stack_size,
+        fibril->stack = as_area_create(AS_AREA_ANY, stack_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
-            AS_AREA_LATE_RESERVE);
+            AS_AREA_LATE_RESERVE, AS_AREA_UNPAGED);
         if (fibril->stack == (void *) -1) {
                 fibril_teardown(fibril, false);