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

Timestamp:

2018-06-26T17:35:40Z (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:

6e569bf

Parents:

fbfe59d (diff), e768aea (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 some preliminary async/fibril framework changes.

File:

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

uspace/lib/c/include/fibril.h

@@ -36 +36 @@
 #define LIBC_FIBRIL_H_
 
-#include <context.h>
 #include <types/common.h>
-#include <adt/list.h>
-#include <libarch/tls.h>
 
-#define FIBRIL_WRITER   1
-
-struct fibril;
+typedef struct fibril fibril_t;
 
 typedef struct {
-        struct fibril *owned_by;
+        fibril_t *owned_by;
 } fibril_owner_info_t;
 
-typedef enum {
-        FIBRIL_PREEMPT,
-        FIBRIL_TO_MANAGER,
-        FIBRIL_FROM_MANAGER,
-        FIBRIL_FROM_DEAD
-} fibril_switch_type_t;
-
 typedef sysarg_t fid_t;
-
-typedef struct fibril {
-        link_t link;
-        link_t all_link;
-        context_t ctx;
-        void *stack;
-        void *arg;
-        errno_t (*func)(void *);
-        tcb_t *tcb;
-
-        struct fibril *clean_after_me;
-        errno_t retval;
-        int flags;
-
-        fibril_owner_info_t *waits_for;
-} fibril_t;
 
 /** Fibril-local variable specifier */
@@ -81 +53 @@
 extern fid_t fibril_create_generic(errno_t (*func)(void *), void *arg, size_t);
 extern void fibril_destroy(fid_t fid);
-extern fibril_t *fibril_setup(void);
-extern void fibril_teardown(fibril_t *f, bool locked);
-extern int fibril_switch(fibril_switch_type_t stype);
 extern void fibril_add_ready(fid_t fid);
-extern void fibril_add_manager(fid_t fid);
-extern void fibril_remove_manager(void);
 extern fid_t fibril_get_id(void);
+extern void fibril_yield(void);
 
 static inline fid_t fibril_create(errno_t (*func)(void *), void *arg)
@@ -94 +62 @@
 }
 
-static inline int fibril_yield(void)
-{
-        return fibril_switch(FIBRIL_PREEMPT);
-}
-
 #endif