Changeset d4ec49e in mainline for uspace/lib/c/generic/task.c

Timestamp:

2019-08-07T05:25:59Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

3ea98e8

Parents:

55fe220

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-14 23:13:41)

git-committer:

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

Message:

taskman: Implement waiting both for retval and exit
Conflicts:

uspace/lib/c/generic/task.c
uspace/lib/c/include/task.h

File:

• uspace/lib/c/generic/task.c (modified) (3 diffs)

uspace/lib/c/generic/task.c

@@ -128 +128 @@
  *
  * @return EOK on success, else error code.
+ * @return TODO check this doesn't return EINVAL -- clash with task_wait
  */
 static errno_t task_setup_wait(task_id_t id, task_wait_t *wait)
 {
         assert(wait->flags);
+        if (wait->flags & TASK_WAIT_BOTH) {
+                wait->flags |= (TASK_WAIT_RETVAL | TASK_WAIT_EXIT);
+        }
+        wait->tid = id;
         async_exch_t *exch = taskman_exchange_begin();
         if (exch == NULL)
@@ -391 +396 @@
  * @param retval Store return value of the task here.
  *
- * @return EOK on success, else error code.
+ * @return EOK on success
+ * @return EINVAL on lost wait TODO other error codes
  */
 errno_t task_wait(task_wait_t *wait, task_exit_t *texit, int *retval)
@@ -397 +403 @@
         errno_t rc;
         async_wait_for(wait->aid, &rc);
-        
-        if (rc == EOK) {
+
+        if (rc == EOK || rc == EINVAL) {
                 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);
+                
+        }
+
+        if (rc == EOK) {
+                /* Is there another wait to be done? Wait for it! */
+                int old_flags = wait->flags;
+                wait->flags = ipc_get_arg3(wait->result);
+                if (wait->flags != 0 && (old_flags & TASK_WAIT_BOTH)) {
+                        rc = task_setup_wait(wait->tid, wait);
+                }
+        } else {
+                wait->flags = 0;
         }