Changeset 5cd2290 in mainline

Timestamp:

2019-08-07T05:35:46Z (5 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.

Location:

uspace

Files:

• app/tester/proc/task_wait.c (modified) (1 diff)
• srv/taskman/main.c (modified) (3 diffs)
• srv/taskman/task.c (modified) (4 diffs)
• srv/taskman/task.h (modified) (1 diff)

uspace/app/tester/proc/task_wait.c

@@ -262 +262 @@
         TASSERT(rc == EOK);
         TASSERT(task_wait_get(&wait) == 0);
-        //TASSERT(texit == TASK_EXIT_UNEXPECTED); // TODO resolve this in taskman/kernel
+        TASSERT(texit == TASK_EXIT_UNEXPECTED);
         TPRINTF("OK\n");
         /* ---- */

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);

uspace/srv/taskman/task.c

@@ -64 +64 @@
         ht_link_t link;
         
-        task_id_t id;        /**< task id. */
-        task_exit_t exit;    /**< task is done. */
+        task_id_t id;          /**< task id. */
+        task_exit_t exit;      /**< task's uspace exit status. */
+        bool failed;           /**< task failed. */
         retval_t retval_type;  /**< task returned a value. */
-        int retval;          /**< the return value. */
+        int retval;            /**< the return value. */
 } hashed_task_t;
 
@@ -302 +303 @@
         ht->id = call->in_task_id;
         ht->exit = TASK_EXIT_RUNNING;
+        ht->failed = false;
         ht->retval_type = RVAL_UNSET;
         ht->retval = -1;
@@ -339 +341 @@
 }
 
-void task_terminated(task_id_t id, task_exit_t texit)
+void task_terminated(task_id_t id, exit_reason_t exit_reason)
 {
         /* Mark task as finished. */
@@ -351 +353 @@
         
         /*
-         * If daemon returns a value and then fails/is killed, it's unexpected
-         * termination.
+         * If daemon returns a value and then fails/is killed, it's an
+         * unexpected termination.
          */
-        if (ht->retval_type == RVAL_UNSET || texit == TASK_EXIT_UNEXPECTED) {
+        if (ht->retval_type == RVAL_UNSET || exit_reason == EXIT_REASON_KILLED) {
                 ht->exit = TASK_EXIT_UNEXPECTED;
-        } else {
-                ht->exit = texit;
+        } else if (ht->failed) {
+                ht->exit = TASK_EXIT_UNEXPECTED;
+        } else  {
+                ht->exit = TASK_EXIT_NORMAL;
         }
         process_pending_wait();
 
         hash_table_remove_item(&task_hash_table, &ht->link);
+finish:
+        fibril_rwlock_write_unlock(&task_hash_table_lock);
+}
+
+void task_failed(task_id_t id)
+{
+        /* Mark task as failed. */
+        fibril_rwlock_write_lock(&task_hash_table_lock);
+        ht_link_t *link = hash_table_find(&task_hash_table, &id);
+        if (link == NULL) {
+                goto finish;
+        }
+
+        hashed_task_t *ht = hash_table_get_inst(link, hashed_task_t, link);
+        
+        ht->failed = true;
+        // TODO design substitution for taskmon (monitoring) = invoke dump utility
+
 finish:
         fibril_rwlock_write_unlock(&task_hash_table_lock);

uspace/srv/taskman/task.h

@@ -45 +45 @@
 
 extern int task_intro(ipc_call_t *, bool);
-extern void task_terminated(task_id_t, task_exit_t);
+extern void task_terminated(task_id_t, exit_reason_t);
+extern void task_failed(task_id_t);
 
 #endif