Changeset 012dd8e in mainline for uspace/lib/c/include

Timestamp:

2019-08-07T09:15:30Z (6 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

Location:

uspace/lib/c/include

Files:

• async.h (modified) (1 diff)
• ipc/common.h (modified) (1 diff)
• ipc/services.h (modified) (1 diff)
• ipc/taskman.h (modified) (2 diffs)
• loader/pcb.h (modified) (1 diff)
• ns.h (modified) (1 diff)
• task.h (modified) (1 diff)
• taskman.h (modified) (1 diff)

uspace/lib/c/include/async.h

@@ -276 +276 @@
 extern sysarg_t async_get_label(void);
 
-extern async_sess_t *async_session_primary_swap(async_sess_t *);
 extern async_sess_t *async_connect_me_to(async_exch_t *, iface_t, sysarg_t,
     sysarg_t);

uspace/lib/c/include/ipc/common.h

@@ -39 +39 @@
 #include <abi/ipc/ipc.h>
 
+/* Well known phone descriptors */
+#define PHONE_INITIAL  0
+
 #define IPC_FLAG_BLOCKING   0x01
 // TODO autostart flag may be united with blocking, this should be later made

uspace/lib/c/include/ipc/services.h

@@ -46 +46 @@
         SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
         SERVICE_SYSMAN     = FOURCC('s', 'y', 's', 'm'),
-        SERVICE_TASKMAN    = FOURCC('t', 's', 'k', 'm'),
         SERVICE_LOGGER     = FOURCC('l', 'o', 'g', 'g'),
         SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),

uspace/lib/c/include/ipc/taskman.h

@@ -42 +42 @@
         TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
         TASKMAN_RETVAL,
-        TASKMAN_EVENT_CALLBACK
+        TASKMAN_EVENT_CALLBACK,
+        TASKMAN_NEW_TASK,
+        TASKMAN_I_AM_NS
 } taskman_request_t;
 
@@ -50 +52 @@
 
 typedef enum {
-        TASKMAN_CONNECT_TO_LOADER = 0,
-        TASKMAN_LOADER_TO_NS,
-        TASKMAN_LOADER_CALLBACK,
-        TASKMAN_CONTROL
-} taskman_interface_t;
+        TASKMAN_CONNECT_TO_NS = 0,
+        TASKMAN_CONNECT_TO_LOADER,
+        TASKMAN_LOADER_CALLBACK
+} taskman_connect_t;
 
 #endif

uspace/lib/c/include/loader/pcb.h

@@ -61 +61 @@
         entry_point_t entry;
 
-        /** Primary session to broker. */
-        async_sess_t *session_primary;
-        
         /** Session to taskman (typically spawn parent) */
         async_sess_t *session_taskman;

uspace/lib/c/include/ns.h

@@ -49 +49 @@
 extern async_sess_t *ns_session_get(void);
 
+extern async_sess_t *ns_get_session(void);
+
 #endif
 

uspace/lib/c/include/task.h

@@ -76 +76 @@
 extern errno_t task_retval(int);
 
-/* Implemented in task_event.h */
+/* Implemented in task_event.c */
 extern int task_register_event_handler(task_event_handler_t);
 

uspace/lib/c/include/taskman.h

@@ -36 +36 @@
 #define LIBC_TASKMAN_H_
 
+#ifndef TASKMAN_DISABLE_ASYNC
 #include <async.h>
+#endif
 
-extern async_sess_t *taskman_handshake(void);
+/* Internal functions to be used by loader only */
+#ifndef TASKMAN_DISABLE_ASYNC
+extern async_sess_t *taskman_get_session(void);
+#endif
+extern int taskman_intro_loader(void);
+
+/* Internal functions to be used by NS only */
+extern int taskman_intro_ns(void);
 
 #endif