Changeset 2f44fafd in mainline for uspace/srv/taskman/main.c

Timestamp:

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

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e0e7eba

Parents:

62273d1

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-12 21:58:23)

git-committer:

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

Message:

taskman: Implement task_wait API to pass all tests

• different behavior for different wait flags
• add locking to fibril code in taskman

Conflicts:

uspace/lib/c/generic/libc.c
uspace/lib/c/generic/task.c

File:

• uspace/srv/taskman/main.c (modified) (8 diffs)

uspace/srv/taskman/main.c

@@ -58 +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. */
+        /* We don't accept the connection request, we forward it instead to
+         * freshly spawned loader. */
         int rc = loader_spawn("loader");
         
@@ -79 +79 @@
         async_exchange_end(exch);
 
-        // TODO leak? what happens with referenced sessions
+        /* After forward we can dispose all session-related resources */
+        async_hangup(sess_ref->sess);
         free(sess_ref);
 
@@ -153 +154 @@
 static void control_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
+        /* TODO remove/redesign the workaround
+         * Call task_intro here for boot-time tasks,
+         * probably they should announce themselves explicitly
+         * or taskman should detect them from kernel's list of tasks.
+         */
+        int rc = task_intro(icall, false);
+
         /* First, accept connection */
-        async_answer_0(iid, EOK);
-
-        // TODO register task to hash table
+        async_answer_0(iid, rc);
+
+        if (rc != EOK) {
+                return;
+        }
+
         control_connection_loop();
 }
@@ -174 +185 @@
         sess_ref->sess = async_callback_receive_start(EXCHANGE_ATOMIC, icall);
         if (sess_ref->sess == NULL) {
-                //TODO different error code?
                 async_answer_0(iid, EINVAL);
                 return;
@@ -180 +190 @@
 
         /* Remember task_id */
-        int rc = task_id_intro(icall);
+        int rc = task_intro(icall, true);
 
         if (rc != EOK) {
@@ -222 +232 @@
         case TASKMAN_LOADER_CALLBACK:
                 loader_callback(iid, icall);
-                // TODO register task to hashtable
                 control_connection_loop();
                 break;
@@ -245 +254 @@
         }
 
-        rc = async_event_subscribe(EVENT_EXIT, task_exit_event, (void *)EVENT_EXIT);
+        rc = async_event_subscribe(EVENT_EXIT, task_exit_event, (void *)TASK_EXIT_NORMAL);
         if (rc != EOK) {
                 printf("Cannot register for exit events (%i).\n", rc);
@@ -251 +260 @@
         }
 
-        rc = async_event_subscribe(EVENT_FAULT, task_exit_event, (void *)EVENT_FAULT);
+        rc = async_event_subscribe(EVENT_FAULT, task_exit_event, (void *)TASK_EXIT_UNEXPECTED);
         if (rc != EOK) {
                 printf("Cannot register for fault events (%i).\n", rc);