Changeset 1be7bee in mainline for uspace/lib/c/include

Timestamp:

2019-08-07T04:20:30Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

70d28e8

Parents:

fe86d9d

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-05 21:17:40)

git-committer:

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

Message:

sysman: Move task retval and waiting logic to taskman (partially)

• two important sessions: NS and taskman
• depending on boot task vs spawned task those sessions are initiated differently

Conflicts:

uspace/lib/c/generic/async.c
uspace/lib/c/generic/libc.c
uspace/lib/c/generic/task.c
uspace/lib/c/include/ipc/ns.h
uspace/lib/c/include/task.h
uspace/lib/posix/source/sys/wait.c
uspace/srv/loader/main.c
uspace/srv/ns/ns.c

Location:

uspace/lib/c/include

Files:

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

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

@@ -42 +42 @@
         NS_REGISTER,
         NS_REGISTER_BROKER,
-        NS_TASK_WAIT,
-        NS_ID_INTRO,
-        NS_RETVAL
+        NS_ID_INTRO
 } ns_request_t;
 

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

@@ -40 +40 @@
 
 typedef enum {
-        TASKMAN_HELLO = IPC_FIRST_USER_METHOD,
+        TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
+        TASKMAN_RETVAL
 } taskman_request_t;
 

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

@@ -64 +64 @@
         async_sess_t *session_primary;
         
+        /** Session to taskman (typically spawn parent) */
+        async_sess_t *session_taskman;
+        
         /** Current working directory. */
         char *cwd;

uspace/lib/c/include/task.h

@@ -42 +42 @@
 #include <types/task.h>
 
+#define TASK_WAIT_EXIT   0x1
+#define TASK_WAIT_RETVAL 0x2
+
 typedef struct {
+        int flags;
         ipc_call_t result;
         aid_t aid;
 } task_wait_t;
 
-struct _TASK;
-typedef struct _TASK task_t;
 
 extern task_id_t task_get_id(void);
@@ -63 +65 @@
     __attribute__((sentinel));
 
-extern errno_t task_setup_wait(task_id_t, task_wait_t *);
+// if there is possibility for further wait, modify task_wait
+extern errno_t task_wait(task_wait_t *, task_exit_t *, int *);
+extern errno_t task_wait_task_id(task_id_t, int, task_exit_t *, int *);
+// similar to listen and socket duplication
+extern errno_t task_wait_any(task_wait_t *, task_id_t *, task_exit_t *, int *,
+    task_wait_t *);
+
+//extern int task_wait_any(int, task_exit_t *, int *);
+// alternative
+// task_wait_t is output param, actual result is obtained via task_wait call
+//extern int task_wait_any(task_wait_t *, int);
+
 extern void task_cancel_wait(task_wait_t *);
-extern errno_t task_wait(task_wait_t *, task_exit_t *, int *);
-extern errno_t task_wait_task_id(task_id_t, task_exit_t *, int *);
+
 extern errno_t task_retval(int);
+//TODO
+//extern int task_exit(int);
 
 #endif