Changeset d73d992 in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2018-06-25T20:10:06Z (7 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:

3679f51a

Parents:

0a0dff8

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 18:56:55)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 20:10:06)

Message:

Hide libc-internal details of the fibril implementation.

File:

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

uspace/lib/c/generic/fibril.c

@@ -49 +49 @@
 #include <async.h>
 
+#include "private/fibril.h"
+
 #ifdef FUTEX_UPGRADABLE
 #include <rcu.h>
@@ -75 +77 @@
         futex_unlock(&fibril_futex);
 
-        fibril_t *fibril = __tcb_get()->fibril_data;
+        fibril_t *fibril = fibril_self();
 
 #ifdef FUTEX_UPGRADABLE
@@ -98 +100 @@
                 return NULL;
 
-        fibril_t *fibril = malloc(sizeof(fibril_t));
+        fibril_t *fibril = calloc(1, sizeof(fibril_t));
         if (!fibril) {
                 tls_free(tcb);
@@ -106 +108 @@
         tcb->fibril_data = fibril;
         fibril->tcb = tcb;
-
-        fibril->func = NULL;
-        fibril->arg = NULL;
-        fibril->stack = NULL;
-        fibril->clean_after_me = NULL;
-        fibril->retval = 0;
-        fibril->flags = 0;
-
-        fibril->waits_for = NULL;
 
         /*
@@ -156 +149 @@
         futex_lock(&fibril_futex);
 
-        fibril_t *srcf = __tcb_get()->fibril_data;
+        fibril_t *srcf = fibril_self();
         fibril_t *dstf = NULL;
 
@@ -345 +338 @@
 }
 
+fibril_t *fibril_self(void)
+{
+        return __tcb_get()->fibril_data;
+}
+
 /** Return fibril id of the currently running fibril.
  *
@@ -352 +350 @@
 fid_t fibril_get_id(void)
 {
-        return (fid_t) __tcb_get()->fibril_data;
+        return (fid_t) fibril_self();
+}
+
+void fibril_yield(void)
+{
+        fibril_switch(FIBRIL_PREEMPT);
 }