Changeset 6deb2cd in mainline

Timestamp:

2017-12-08T21:17:27Z (7 years ago)

Author:

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

Branches:

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

Children:

9233e9d

Parents:

125c09c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 16:46:52)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return capability handle in SYS_IPC_WAIT via call data structure, separately from error codes.

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/sysipc.c (modified) (6 diffs)
• uspace/lib/c/generic/async.c (modified) (2 diffs)
• uspace/lib/c/generic/ipc.c (modified) (3 diffs)
• uspace/lib/c/include/ipc/common.h (modified) (1 diff)
• uspace/lib/c/include/ipc/ipc.h (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -110 +110 @@
         /** User-defined label */
         sysarg_t label;
+        /** Capability handle */
+        cap_handle_t cap_handle;
 } ipc_data_t;
 

kernel/generic/src/ipc/sysipc.c

@@ -744 +744 @@
  *                 for explanation.
  *
- * @return Capability handle of the received request.
- * @return CAP_NIL for answers, notifications and when there is no call.
  * @return Negative error code on error.
  */
@@ -767 +765 @@
 
         if (!call) {
-                STRUCT_TO_USPACE(calldata, &(ipc_data_t){});
-                return CAP_NIL;
+                ipc_data_t data = {0};
+                data.cap_handle = CAP_NIL;
+                STRUCT_TO_USPACE(calldata, &data);
+                return EOK;
         }
         
@@ -776 +776 @@
                 
                 call->data.flags = IPC_CALL_NOTIF;
+                call->data.cap_handle = CAP_NIL;
 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return CAP_NIL;
+                return EOK;
         }
         
@@ -792 +793 @@
 
                 call->data.flags = IPC_CALL_ANSWERED;
+                call->data.cap_handle = CAP_NIL;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return CAP_NIL;
+                return EOK;
         }
         
@@ -809 +811 @@
         }
         
+        call->data.cap_handle = handle;
+
         /*
          * Include phone hash of the caller in the request, copy the whole
@@ -819 +823 @@
         kobject_add_ref(call->kobject);
         cap_publish(TASK, handle, call->kobject);
-        return handle;
+        return EOK;
 
 error:

uspace/lib/c/generic/async.c

@@ -1483 +1483 @@
                 
                 ipc_call_t call;
-                cap_handle_t chandle = ipc_wait_cycle(&call, timeout, flags);
+                int rc = ipc_wait_cycle(&call, timeout, flags);
                 
                 atomic_dec(&threads_in_ipc_wait);
                 
-                assert(chandle >= 0);
-
-                if (chandle == CAP_NIL) {
+                assert(rc == EOK);
+
+                if (call.cap_handle == CAP_NIL) {
                         if (call.flags == 0) {
                                 /* This neither a notification nor an answer. */
@@ -1500 +1500 @@
                         continue;
 
-                handle_call(chandle, &call);
+                handle_call(call.cap_handle, &call);
         }
 

uspace/lib/c/generic/ipc.c

@@ -254 +254 @@
  * @param usec   Timeout in microseconds
  * @param flags  Flags passed to SYS_IPC_WAIT (blocking, nonblocking).
- *
- * @return  Call handle.
- * @return  Negative error code.
- */
-cap_handle_t ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags)
-{
-        cap_handle_t chandle =
-            __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
+ * @param[out] out_handle  Call handle.
+ *
+ * @return  Error code.
+ */
+int ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags)
+{
+        int rc = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
         
         /* Handle received answers */
-        if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED))
+        if ((rc == EOK) && (call->cap_handle == CAP_NIL) &&
+            (call->flags & IPC_CALL_ANSWERED)) {
                 handle_answer(call);
-        
-        return chandle;
+        }
+        
+        return rc;
 }
 
@@ -285 +286 @@
  * @param usec  Timeout in microseconds
  *
- * @return  Call handle.
- * @return  Negative error code.
- *
- */
-cap_handle_t ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec)
-{
-        cap_handle_t chandle;
+ * @return  Error code.
+ *
+ */
+int ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec)
+{
+        int rc;
         
         do {
-                chandle = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return chandle;
+                rc = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
+        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return rc;
 }
 
@@ -306 +306 @@
  * @param call  Incoming call storage.
  *
- * @return  Call handle.
- * @return  Negative error code.
- *
- */
-cap_handle_t ipc_trywait_for_call(ipc_call_t *call)
-{
-        cap_handle_t chandle;
+ * @return  Error code.
+ *
+ */
+int ipc_trywait_for_call(ipc_call_t *call)
+{
+        int rc;
         
         do {
-                chandle = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
+                rc = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NON_BLOCKING);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
-        
-        return chandle;
+        } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
+        
+        return rc;
 }
 

uspace/lib/c/include/ipc/common.h

@@ -52 +52 @@
         unsigned flags;
         struct async_call *label;
+        cap_handle_t cap_handle;
 } ipc_call_t;
 

uspace/lib/c/include/ipc/ipc.h

@@ -48 +48 @@
 typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
 
-extern cap_handle_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern int ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
 extern void ipc_poke(void);
 
@@ -54 +54 @@
         ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 
-extern cap_handle_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
-extern cap_handle_t ipc_trywait_for_call(ipc_call_t *);
+extern int ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
+extern int ipc_trywait_for_call(ipc_call_t *);
 
 /*