Changeset 012dd8e in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2019-08-07T09:15:30Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e8747bd8

Parents:

780c8ce

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-01 00:08:04)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 09:15:30)

Message:

taskman: Handle INIT_TASKS as tasks spawned by loader

• everyone is connected to its spawner, except for INIT_TASKS, they are connected to taskman (first binary)
• taskman is now aware even of INIT_TASKS and taskman itself
• refactored taskman handshake — NS session is created lazily
• refactored async.c with usage of create_session
• changed EINVAL to EINTR on lost waits
• removed TODOs from taskman and related libc TODOs

Conflicts:

abi/include/abi/ipc/methods.h
boot/Makefile.common
uspace/lib/c/generic/async.c
uspace/lib/c/generic/libc.c
uspace/lib/c/generic/loader.c
uspace/lib/c/generic/ns.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/generic/private/taskman.h
uspace/lib/c/generic/task.c
uspace/lib/c/include/async.h
uspace/lib/c/include/task.h
uspace/srv/loader/main.c
uspace/srv/ns/ns.c

File:

• uspace/lib/c/generic/libc.c (modified) (3 diffs)

uspace/lib/c/generic/libc.c

@@ -51 +51 @@
 #include "private/fibril.h"
 #include "private/malloc.h"
-#include "private/ns.h" // TODO maybe better filename for session_primary
 #include "private/task.h"
+#include "private/taskman.h"
 
 
@@ -63 +63 @@
 static bool env_setup;
 static fibril_t main_fibril;
+
+static void initialize_taskman(pcb_t *pcb)
+{
+        if (__pcb == NULL) {
+                async_sess_t *session_tm = taskman_connect();
+                if (session_tm == NULL) {
+                        abort();
+                }
+                __task_init(session_tm);
+        } else {
+                __task_init(__pcb->session_taskman);
+        }
+}
 
 void __libc_main(void *pcb_ptr)
@@ -107 +120 @@
 #endif
         
-        /* Setup async framework */
+        /* Setup async framework and taskman connection */
         __async_server_init();
-        if (__pcb == NULL) {
-                __async_client_init(NULL);
-                __task_init(NULL);
-        } else {
-                __async_client_init(__pcb->session_primary);
-                __task_init(__pcb->session_taskman);
-        }
+        __async_client_init();
         __async_ports_init();
+        initialize_taskman(__pcb);
 
         /* The basic run-time environment is setup */