Changeset e0a4686 in mainline for uspace/lib/c/include/fibril.h

Timestamp:

2018-03-08T18:25:31Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

53ad43c, 615e83d

Parents:

fd57cf17

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 22:03:11)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 18:25:31)

Message:

Introduce context_swap() and use it to simplify fibril implementation.

This wraps the use of context_save()/context_restore(), to provide a more
natural (and easier to understand) control flow. The patch also hides the
details of the underlying context, requiring the use of context_get_pc()
to acquire program counter. This might allow context_swap() to only store
one pointer in the context, storing the remaining information in its stack
frame. However, that is not done in this patch.

File:

• uspace/lib/c/include/fibril.h (modified) (3 diffs)

uspace/lib/c/include/fibril.h

@@ -36 +36 @@
 #define LIBC_FIBRIL_H_
 
-#include <libarch/fibril.h>
+#include <context.h>
 #include <types/common.h>
 #include <adt/list.h>
 #include <libarch/tls.h>
-
-#define context_set_generic(c, _pc, stack, size, ptls) \
-        do { \
-                (c)->pc = (sysarg_t) (_pc); \
-                (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-                (c)->tls = (sysarg_t) (ptls); \
-        } while (0)
 
 #define FIBRIL_WRITER   1
@@ -86 +79 @@
 #define fibril_local __thread
 
-extern int context_save(context_t *ctx) __attribute__((returns_twice));
-extern void context_restore(context_t *ctx) __attribute__((noreturn));
-
 #define FIBRIL_DFLT_STK_SIZE    0
 
-#define fibril_create(func, arg) \
-        fibril_create_generic((func), (arg), FIBRIL_DFLT_STK_SIZE)
 extern fid_t fibril_create_generic(errno_t (*func)(void *), void *arg, size_t);
 extern void fibril_destroy(fid_t fid);
@@ -103 +91 @@
 extern fid_t fibril_get_id(void);
 
+static inline fid_t fibril_create(errno_t (*func)(void *), void *arg)
+{
+        return fibril_create_generic(func, arg, FIBRIL_DFLT_STK_SIZE);
+}
+
 static inline int fibril_yield(void)
 {