Changeset acf6b55 in mainline

Timestamp:

2018-07-05T16:20:43Z (7 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.

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/ipc.c (modified) (7 diffs)
• kernel/generic/src/ipc/kbox.c (modified) (1 diff)
• kernel/generic/src/ipc/sysipc.c (modified) (4 diffs)
• uspace/lib/c/generic/async/server.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -193 +193 @@
 extern errno_t ipc_call_sync(phone_t *, call_t *);
 extern errno_t ipc_call(phone_t *, call_t *);
-extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
+extern errno_t ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int, call_t **);
 extern errno_t ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);
 extern void ipc_answer(answerbox_t *, call_t *);

kernel/generic/src/ipc/ipc.c

@@ -230 +230 @@
         }
 
-        call_t *answer = ipc_wait_for_call(mybox, SYNCH_NO_TIMEOUT,
-            SYNCH_FLAGS_INTERRUPTIBLE);
+        call_t *answer = NULL;
+        (void) ipc_wait_for_call(mybox, SYNCH_NO_TIMEOUT,
+            SYNCH_FLAGS_INTERRUPTIBLE, &answer);
         if (!answer) {
 
@@ -267 +268 @@
                          * now.
                          */
-                        answer = ipc_wait_for_call(mybox, SYNCH_NO_TIMEOUT,
-                            SYNCH_FLAGS_NONE);
+                        (void) ipc_wait_for_call(mybox, SYNCH_NO_TIMEOUT,
+                            SYNCH_FLAGS_NONE, &answer);
                 }
         }
@@ -536 +537 @@
  *              waitq_sleep_timeout() for description of its special
  *              meaning.
- *
- * @return Recived call structure or NULL.
+ * @param call  Received call structure or NULL.
+ *
+ * @return Error code from waitq_sleep_timeout.
+ *         ENOENT if sleep returns successfully, but there is no call.
  *
  * To distinguish between a call and an answer, have a look at call->flags.
  *
  */
-call_t *ipc_wait_for_call(answerbox_t *box, uint32_t usec, unsigned int flags)
+errno_t ipc_wait_for_call(answerbox_t *box, uint32_t usec, unsigned int flags,
+    call_t **call)
 {
         call_t *request;
@@ -552 +556 @@
         rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
         if (rc != EOK)
-                return NULL;
+                return rc;
 
         irq_spinlock_lock(&box->lock, true);
@@ -594 +598 @@
                  */
                 irq_spinlock_unlock(&box->lock, true);
-                return NULL;
+                return ENOENT;
         }
 
@@ -605 +609 @@
         irq_spinlock_unlock(&TASK->lock, true);
 
-        return request;
+        *call = request;
+        return EOK;
 }
 
@@ -779 +784 @@
 {
         while (atomic_get(&TASK->answerbox.active_calls) != 0) {
-                call_t *call = ipc_wait_for_call(&TASK->answerbox,
-                    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
+                call_t *call = NULL;
+                if (ipc_wait_for_call(&TASK->answerbox,
+                    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE, &call) == ENOENT)
+                        continue;
+                assert(call);
                 assert(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
 

kernel/generic/src/ipc/kbox.c

@@ -168 +168 @@
 
         while (!done) {
-                call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
-                    SYNCH_FLAGS_NONE);
+                call_t *call = NULL;
+                (void) ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
+                    SYNCH_FLAGS_NONE, &call);
 
                 if (call == NULL)

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;

uspace/lib/c/generic/async/server.c

@@ -1199 +1199 @@
                 atomic_dec(&threads_in_ipc_wait);
 
-                assert(rc == EOK);
-                handle_call(&call);
+                if (rc == EOK)
+                        handle_call(&call);
         }