Changes in uspace/lib/c/generic/fibril.c [eceff5f:c0699467] in mainline

File:

• uspace/lib/c/generic/fibril.c (modified) (9 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>
@@ -50 +47 @@
 #include <async.h>
 
+#ifndef FIBRIL_INITIAL_STACK_PAGES_NO
+        #define FIBRIL_INITIAL_STACK_PAGES_NO  1
+#endif
+
 /**
  * This futex serializes access to ready_list,
@@ -95 +96 @@
 fibril_t *fibril_setup(void)
 {
-        tcb_t *tcb = tls_make();
+        tcb_t *tcb = __make_tls();
         if (!tcb)
                 return NULL;
@@ -101 +102 @@
         fibril_t *fibril = malloc(sizeof(fibril_t));
         if (!fibril) {
-                tls_free(tcb);
+                __free_tls(tcb);
                 return NULL;
         }
@@ -122 +123 @@
 void fibril_teardown(fibril_t *fibril)
 {
-        tls_free(fibril->tcb);
+        __free_tls(fibril->tcb);
         free(fibril);
 }
@@ -194 +195 @@
                                          * stack member filled.
                                          */
-                                        as_area_destroy(stack);
+                                        free(stack);
                                 }
                                 fibril_teardown(srcf->clean_after_me);
@@ -256 +257 @@
  * @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_generic(int (*func)(void *), void *arg, size_t stksz)
+fid_t fibril_create(int (*func)(void *), void *arg)
 {
         fibril_t *fibril;
@@ -269 +269 @@
                 return 0;
         
-        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->stack =
+            (char *) malloc(FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize());
+        if (!fibril->stack) {
                 fibril_teardown(fibril);
                 return 0;
@@ -284 +281 @@
         context_save(&fibril->ctx);
         context_set(&fibril->ctx, FADDR(fibril_main), fibril->stack,
-            stack_size, fibril->tcb);
+            FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize(), fibril->tcb);
 
         return (fid_t) fibril;
-}
-
-/** Delete a fibril that has never run.
- *
- * Free resources of a fibril that has been created with fibril_create()
- * but never readied using fibril_add_ready().
- *
- * @param fid Pointer to the fibril structure of the fibril to be
- *            added.
- */
-void fibril_destroy(fid_t fid)
-{
-        fibril_t *fibril = (fibril_t *) fid;
-        
-        as_area_destroy(fibril->stack);
-        fibril_teardown(fibril);
 }