Changeset 1be7bee in mainline for uspace/srv/loader/main.c

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

File:

• uspace/srv/loader/main.c (modified) (4 diffs)

uspace/srv/loader/main.c

@@ -84 +84 @@
 static async_sess_t *session_primary = NULL;
 
+/** Session to taskman (typically our spawner) */
+static async_sess_t *session_taskman = NULL;
+
 /** Current working directory */
 static char *cwd = NULL;
@@ -335 +338 @@
 
         pcb.session_primary = session_primary;
+        pcb.session_taskman = session_taskman;
 
         pcb.cwd = cwd;
@@ -452 +456 @@
 }
 
+/** Handshake with taskman
+ *
+ * Taskman is our spawn parent, i.e. PHONE_INITIAL is connected to it.
+ * Goal of the handshake is to obtain phone to naming service and also keep the
+ * session to taskman.
+ *
+ * @return EOK on success, for errors see taskman_handshake()
+ */
 static errno_t ldr_taskman_handshake(void)
 {
+        assert(session_primary == NULL);
+        assert(session_taskman == NULL);
+
         errno_t retval = EOK;
 
@@ -463 +478 @@
         }
 
-        async_sess_t *session_tm = async_session_primary_swap(session_primary);
-        (void)async_hangup(session_tm);
+        session_taskman = async_session_primary_swap(session_primary);
 
         handshake_complete = true;