Changeset acf6b55 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2018-07-05T16:20:43Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

058c240

Parents:

bd9e868

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-04 23:32:32)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-05 16:20:43)

Message:

Make it possible for uspace to determine why SYS_IPC_WAIT returned.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (4 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -751 +751 @@
     unsigned int flags)
 {
-        call_t *call;
+        call_t *call = NULL;
 
 restart:
@@ -759 +759 @@
 #endif
 
-        call = ipc_wait_for_call(&TASK->answerbox, usec,
-            flags | SYNCH_FLAGS_INTERRUPTIBLE);
+        errno_t rc = ipc_wait_for_call(&TASK->answerbox, usec,
+            flags | SYNCH_FLAGS_INTERRUPTIBLE, &call);
 
 #ifdef CONFIG_UDEBUG
@@ -766 +766 @@
 #endif
 
-        if (!call) {
-                ipc_data_t data = { };
-                data.cap_handle = CAP_NIL;
-                STRUCT_TO_USPACE(calldata, &data);
-                return EOK;
-        }
+        if (rc != EOK)
+                return rc;
+
+        assert(call);
 
         call->data.flags = call->flags;
@@ -806 +804 @@
 
         cap_handle_t handle = CAP_NIL;
-        errno_t rc = cap_alloc(TASK, &handle);
+        rc = cap_alloc(TASK, &handle);
         if (rc != EOK) {
                 goto error;