Changeset 1be7bee in mainline for uspace/srv/taskman/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/taskman/main.c (modified) (6 diffs)

uspace/srv/taskman/main.c

@@ -34 +34 @@
 #include <ipc/taskman.h>
 #include <loader/loader.h>
+#include <macros.h>
 #include <ns.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#define NAME "taskman"
+#include "task.h"
+#include "taskman.h"
 
 //TODO move to appropriate header file
@@ -56 +58 @@
 static void connect_to_loader(ipc_callid_t iid, ipc_call_t *icall)
 {
+        //TODO explain why we don't explicitly accept connection request
         /* Spawn a loader. */
         int rc = loader_spawn("loader");
@@ -99 +102 @@
 }
 
+static void taskman_ctl_wait(ipc_callid_t iid, ipc_call_t *icall)
+{
+        task_id_t id = (task_id_t)
+            MERGE_LOUP32(IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall));
+        int flags = IPC_GET_ARG3(*icall);
+
+        wait_for_task(id, flags, iid, icall);
+}
+
+static void taskman_ctl_retval(ipc_callid_t iid, ipc_call_t *icall)
+{
+        printf("%s:%i\n", __func__, __LINE__);
+        int rc = task_set_retval(icall);
+        async_answer_0(iid, rc);
+}
+
+static void control_connection_loop(void)
+{
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* Client disconnected */
+                        break;
+                }
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case TASKMAN_WAIT:
+                        taskman_ctl_wait(callid, &call);
+                        break;
+                case TASKMAN_RETVAL:
+                        taskman_ctl_retval(callid, &call);
+                        break;
+                default:
+                        async_answer_0(callid, ENOENT);
+                }
+        }
+}
+
+static void control_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+        /* First, accept connection */
+        async_answer_0(iid, EOK);
+
+        // TODO register task to hash table
+        control_connection_loop();
+}
+
 static void loader_callback(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -134 +186 @@
                 loader_to_ns(iid, icall);
                 break;
+        case TASKMAN_CONTROL:
+                control_connection(iid, icall);
+                // ---- interrupt here ----
+                //   implement control connection body (setup wait)
+                // ------------------------
+                break;
         default:
                 /* Unknown interface */
@@ -146 +204 @@
         case TASKMAN_LOADER_CALLBACK:
                 loader_callback(iid, icall);
+                // TODO register task to hashtable
+                control_connection_loop();
                 break;
         default:
@@ -161 +221 @@
 
         prodcons_initialize(&sess_queue);
+        int rc = task_init();
+        if (rc != EOK) {
+                return rc;
+        }
 
         /* We're service too */
-        int rc = service_register(SERVICE_TASKMAN);
+        rc = service_register(SERVICE_TASKMAN);
         if (rc != EOK) {
                 printf("Cannot register at naming service (%i).", rc);