Changeset 62273d1 in mainline for uspace/srv/taskman/main.c

Timestamp:

2019-08-07T04:27:24Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

2f44fafd

Parents:

70d28e8

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-08 21:46:22)

git-committer:

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

Message:

taskman: Implement simple task exit monitoring

File:

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

uspace/srv/taskman/main.c

@@ -79 +79 @@
         async_exchange_end(exch);
 
+        // TODO leak? what happens with referenced sessions
         free(sess_ref);
 
@@ -116 +117 @@
         int rc = task_set_retval(icall);
         async_answer_0(iid, rc);
+}
+
+static void task_exit_event(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        printf("%s:%i\n", __func__, __LINE__);
+        // TODO design substitution for taskmon (monitoring)
+        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall));
+        task_terminated(id, (task_exit_t)arg);
 }
 
@@ -161 +170 @@
                 async_answer_0(iid, ENOMEM);
         }
-        
 
         /* Create callback connection */
@@ -170 +178 @@
                 return;
         }
+
+        /* Remember task_id */
+        int rc = task_id_intro(icall);
+
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                free(sess_ref);
+                return;
+        }
         async_answer_0(iid, EOK);
 
+        /* Notify spawners */
         link_initialize(&sess_ref->link);
         prodcons_produce(&sess_queue, &sess_ref->link);
@@ -220 +238 @@
         printf(NAME ": HelenOS task manager\n");
 
+        /* Initialization */
         prodcons_initialize(&sess_queue);
         int rc = task_init();
@@ -226 +245 @@
         }
 
+        rc = async_event_subscribe(EVENT_EXIT, task_exit_event, (void *)EVENT_EXIT);
+        if (rc != EOK) {
+                printf("Cannot register for exit events (%i).\n", rc);
+                return rc;
+        }
+
+        rc = async_event_subscribe(EVENT_FAULT, task_exit_event, (void *)EVENT_FAULT);
+        if (rc != EOK) {
+                printf("Cannot register for fault events (%i).\n", rc);
+                return rc;
+        }
+
         /* We're service too */
         rc = service_register(SERVICE_TASKMAN);
         if (rc != EOK) {
-                printf("Cannot register at naming service (%i).", rc);
+                printf("Cannot register at naming service (%i).\n", rc);
                 return rc;
         }