Changeset 25eec4e in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

uspace/lib/c/generic/fibril.c

@@ -37 +37 @@
 #include <fibril.h>
 #include <thread.h>
+#include <stack.h>
 #include <tls.h>
 #include <malloc.h>
+#include <abi/mm/as.h>
+#include <as.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -47 +50 @@
 #include <async.h>
 
-#ifndef FIBRIL_INITIAL_STACK_PAGES_NO
-        #define FIBRIL_INITIAL_STACK_PAGES_NO  1
-#endif
-
 /**
  * This futex serializes access to ready_list,
@@ -96 +95 @@
 fibril_t *fibril_setup(void)
 {
-        tcb_t *tcb = __make_tls();
+        tcb_t *tcb = tls_make();
         if (!tcb)
                 return NULL;
@@ -102 +101 @@
         fibril_t *fibril = malloc(sizeof(fibril_t));
         if (!fibril) {
-                __free_tls(tcb);
+                tls_free(tcb);
                 return NULL;
         }
@@ -123 +122 @@
 void fibril_teardown(fibril_t *fibril)
 {
-        __free_tls(fibril->tcb);
+        tls_free(fibril->tcb);
         free(fibril);
 }
@@ -195 +194 @@
                                          * stack member filled.
                                          */
-                                        free(stack);
+                                        as_area_destroy(stack);
                                 }
                                 fibril_teardown(srcf->clean_after_me);
@@ -257 +256 @@
  * @param func Implementing function of the new fibril.
  * @param arg Argument to pass to func.
+ * @param stksz Stack size in bytes.
  *
  * @return 0 on failure or TLS of the new fibril.
  *
  */
-fid_t fibril_create(int (*func)(void *), void *arg)
+fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t stksz)
 {
         fibril_t *fibril;
@@ -269 +269 @@
                 return 0;
         
-        fibril->stack =
-            (char *) malloc(FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize());
-        if (!fibril->stack) {
+        size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ?
+            stack_size_get() : stksz;
+        fibril->stack = as_area_create((void *) -1, stack_size,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
+            AS_AREA_LATE_RESERVE);
+        if (fibril->stack == (void *) -1) {
                 fibril_teardown(fibril);
                 return 0;
@@ -281 +284 @@
         context_save(&fibril->ctx);
         context_set(&fibril->ctx, FADDR(fibril_main), fibril->stack,
-            FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize(), fibril->tcb);
+            stack_size, fibril->tcb);
 
         return (fid_t) fibril;
@@ -298 +301 @@
         fibril_t *fibril = (fibril_t *) fid;
         
-        free(fibril->stack);
+        as_area_destroy(fibril->stack);
         fibril_teardown(fibril);
 }