Changeset 514d561 in mainline for uspace/lib/c/generic/private/fibril.h

Timestamp:

2018-07-20T16:27:20Z (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:

05208d9

Parents:

7137f74c

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-19 21:52:47)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-20 16:27:20)

Message:

Fibril/async implementation overhaul.

This commit marks the move towards treating the fibril library as a mere
implementation of a generic threading interface. Understood as a layer that
wraps the kernel threads, we not only have to wrap threading itself, but also
every syscall that blocks the kernel thread (by blocking, we mean thread not
doing useful work until an external event happens — e.g. locking a kernel
mutex or thread sleep is understood as blocking, but an as_area_create() is not,
despite potentially taking a long time to complete).

Consequently, we implement fibril_ipc_wait() as a fibril-native wrapper for
kernel's ipc_wait(), and also implement timer functionality like timeouts
as part of the fibril library. This removes the interdependency between fibril
implementation and the async framework — in theory, the fibril API could be
reimplemented as a simple 1:1 shim, and the async framework would continue
working normally (note that the current implementation of loader complicates
this).

To better isolate the fibril internals from the implementation of high-level
synchronization, a fibril_event_t is added. This object conceptually acts
like a single slot wait queue. All other synchronization is implemented in
terms of this primitive.

File:

• uspace/lib/c/generic/private/fibril.h (modified) (2 diffs)

uspace/lib/c/generic/private/fibril.h

@@ -42 +42 @@
         context_t ctx;
 
+        uspace_arg_t uarg;
         link_t link;
         void *stack;
+        size_t stack_size;
         void *arg;
         errno_t (*func)(void *);
@@ -51 +53 @@
         errno_t retval;
 
-        fibril_owner_info_t *waits_for;
+        fibril_t *thread_ctx;
 
-        atomic_t futex_locks;
+        bool is_running : 1;
         bool is_writer : 1;
         /* In some places, we use fibril structs that can't be freed. */
         bool is_freeable : 1;
+
+        /* Debugging stuff. */
+        atomic_t futex_locks;
+        fibril_owner_info_t *waits_for;
+        fibril_event_t *sleep_event;
 };
-
-typedef enum {
-        FIBRIL_PREEMPT,
-        FIBRIL_FROM_BLOCKED,
-        FIBRIL_FROM_MANAGER,
-        FIBRIL_FROM_DEAD
-} fibril_switch_type_t;
 
 extern fibril_t *fibril_alloc(void);
 extern void fibril_setup(fibril_t *);
-extern void fibril_teardown(fibril_t *f, bool locked);
-extern int fibril_switch(fibril_switch_type_t stype);
-extern void fibril_add_manager(fid_t fid);
-extern void fibril_remove_manager(void);
+extern void fibril_teardown(fibril_t *f);
 extern fibril_t *fibril_self(void);
 
+extern void __fibrils_init(void);
+
 #endif