Changeset 2b95d13 in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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 changes.

File:

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

uspace/lib/c/generic/fibril.c

@@ -95 +95 @@
 fibril_t *fibril_setup(void)
 {
-        tcb_t *tcb = __make_tls();
+        tcb_t *tcb = tls_make();
         if (!tcb)
                 return NULL;
@@ -101 +101 @@
         fibril_t *fibril = malloc(sizeof(fibril_t));
         if (!fibril) {
-                __free_tls(tcb);
+                tls_free(tcb);
                 return NULL;
         }
@@ -122 +122 @@
 void fibril_teardown(fibril_t *fibril)
 {
-        __free_tls(fibril->tcb);
+        tls_free(fibril->tcb);
         free(fibril);
 }
@@ -256 +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;
@@ -268 +269 @@
                 return 0;
         
-        size_t stack_size = stack_size_get();
+        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 |