Changeset 5cd2290 in mainline for uspace/srv/taskman/main.c

Timestamp:

2019-08-07T05:35:46Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

b22b0a94

Parents:

1fb4a49

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-18 10:53:14)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 05:35:46)

Message:

taskman: Make use of EVENT_EXIT exit_reason parameter

• Also improved handling of EVENT_FAULT — it only marks task as failed, waiters are notified after EVENT_EXIT happens.

File:

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

uspace/srv/taskman/main.c

@@ -122 +122 @@
 static void task_exit_event(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        // TODO design substitution for taskmon (monitoring)
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall));
-        printf("%s:%i from %llu/%i\n", __func__, __LINE__, id, (task_exit_t)arg);
-        task_terminated(id, (task_exit_t)arg);
+        exit_reason_t exit_reason = IPC_GET_ARG3(*icall);
+        printf("%s:%i from %llu/%i\n", __func__, __LINE__, id, exit_reason);
+        task_terminated(id, exit_reason);
+}
+
+static void task_fault_event(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall));
+        printf("%s:%i from %llu\n", __func__, __LINE__, id);
+        task_failed(id);
 }
 
@@ -254 +261 @@
         }
 
-        rc = async_event_subscribe(EVENT_EXIT, task_exit_event, (void *)TASK_EXIT_NORMAL);
+        rc = async_event_subscribe(EVENT_EXIT, task_exit_event, NULL);
         if (rc != EOK) {
                 printf("Cannot register for exit events (%i).\n", rc);
@@ -260 +267 @@
         }
 
-        rc = async_event_subscribe(EVENT_FAULT, task_exit_event, (void *)TASK_EXIT_UNEXPECTED);
+        rc = async_event_subscribe(EVENT_FAULT, task_fault_event, NULL);
         if (rc != EOK) {
                 printf("Cannot register for fault events (%i).\n", rc);