Changeset 5044114 in mainline

Timestamp:

2019-08-07T04:46:21Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

55fe220

Parents:

e0e7eba

git-author:

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

git-committer:

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

Message:

taskman: Allow relaxed task_wait setups
Conflicts:

uspace/lib/c/generic/task.c

File:

• uspace/lib/c/generic/task.c (modified) (1 diff)

uspace/lib/c/generic/task.c

@@ -395 +395 @@
 errno_t task_wait(task_wait_t *wait, task_exit_t *texit, int *retval)
 {
-        assert(texit);
-        assert(retval);
-
         errno_t rc;
         async_wait_for(wait->aid, &rc);
-
+        
         if (rc == EOK) {
-                *texit = ipc_get_arg1(&wait->result);
-                *retval = ipc_get_arg2(&wait->result);
+                if (wait->flags & TASK_WAIT_EXIT && texit)
+                        *texit = ipc_get_arg1(wait->result);
+                if (wait->flags & TASK_WAIT_RETVAL && retval)
+                        *retval = ipc_get_arg2(wait->result);
         }