Changeset a097c50 in mainline

Timestamp:

2019-08-07T10:08:48Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

7cce333

Parents:

ed5367b

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-06 00:12:39)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 10:08:48)

Message:

taskman: Do not notify retval (again) for exited daemon

Location:

uspace

Files:

• app/tester/proc/task_anywait.c (modified) (1 diff)
• srv/taskman/event.c (modified) (1 diff)

uspace/app/tester/proc/task_anywait.c

@@ -39 +39 @@
 static task_id_t task_id;
 static task_exit_t last_texit;
-static bool last_flags;
+static int last_flags;
 static int last_retval;
 static bool handler_hit;

uspace/srv/taskman/event.c

@@ -69 +69 @@
 {
         int flags = 0;
+        if (task->retval_type == RVAL_SET) {
+                flags |= TASK_WAIT_RETVAL;
+        }
+
         if (task->exit != TASK_EXIT_RUNNING) {
                 flags |= TASK_WAIT_EXIT;
                 if (task->retval_type == RVAL_SET_EXIT) {
                         flags |= TASK_WAIT_RETVAL;
-                }
-        }
-        if (task->retval_type == RVAL_SET) {
-                flags |= TASK_WAIT_RETVAL;
-        }
-
+                } else {
+                        /* Don't notify retval of exited task */
+                        flags &= ~TASK_WAIT_RETVAL;
+                }
+        }
         return flags;
 }