Changeset 25a179e in mainline for uspace/lib/c/generic/async.c

Timestamp:

2017-12-20T19:51:45Z (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:

f96b6c8

Parents:

d4a829e

Message:

IPC return values are always errno constants. Adjust types to reflect that.

In principle, IPC server is not allowed to return non-errno values via
the "main" return value, because kernel interprets it (e.g. EHANGUP).
It's still possible to return arbitrary additional return values alongside EOK,
which are not interpreted in normal communication.

File:

• uspace/lib/c/generic/async.c (modified) (18 diffs)

uspace/lib/c/generic/async.c

@@ -205 +205 @@
         ipc_call_t *dataptr;
         
-        sysarg_t retval;
+        int retval;
 } amsg_t;
 
@@ -332 +332 @@
                 msg->destroyed = false;
                 msg->dataptr = NULL;
-                msg->retval = (sysarg_t) EINVAL;
+                msg->retval = EINVAL;
                 awaiter_initialize(&msg->wdata);
         }
@@ -860 +860 @@
             &answer);
         
-        sysarg_t ret;
+        int ret;
         async_wait_for(req, &ret);
         if (ret != EOK)
@@ -1708 +1708 @@
  *
  */
-void async_wait_for(aid_t amsgid, sysarg_t *retval)
+void async_wait_for(aid_t amsgid, int *retval)
 {
         assert(amsgid);
@@ -1754 +1754 @@
  *
  */
-int async_wait_timeout(aid_t amsgid, sysarg_t *retval, suseconds_t timeout)
+int async_wait_timeout(aid_t amsgid, int *retval, suseconds_t timeout)
 {
         assert(amsgid);
@@ -1917 +1917 @@
  *
  */
-sysarg_t async_req_fast(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
+int async_req_fast(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
@@ -1928 +1928 @@
             &result);
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(aid, &rc);
         
@@ -1969 +1969 @@
  *
  */
-sysarg_t async_req_slow(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
+int async_req_slow(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
@@ -1980 +1980 @@
             &result);
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(aid, &rc);
         
@@ -2044 +2044 @@
 }
 
-sysarg_t async_answer_0(cap_handle_t chandle, sysarg_t retval)
+int async_answer_0(cap_handle_t chandle, int retval)
 {
         return ipc_answer_0(chandle, retval);
 }
 
-sysarg_t async_answer_1(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1)
+int async_answer_1(cap_handle_t chandle, int retval, sysarg_t arg1)
 {
         return ipc_answer_1(chandle, retval, arg1);
 }
 
-sysarg_t async_answer_2(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
+int async_answer_2(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2)
 {
@@ -2060 +2060 @@
 }
 
-sysarg_t async_answer_3(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
+int async_answer_3(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3)
 {
@@ -2066 +2066 @@
 }
 
-sysarg_t async_answer_4(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
+int async_answer_4(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
@@ -2072 +2072 @@
 }
 
-sysarg_t async_answer_5(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1,
+int async_answer_5(cap_handle_t chandle, int retval, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
 {
@@ -2120 +2120 @@
             &answer);
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(req, &rc);
         if (rc != EOK)
@@ -2147 +2147 @@
             msg, reply_received);
         
-        sysarg_t rc;
+        int rc;
         async_wait_for((aid_t) msg, &rc);
         
@@ -2886 +2886 @@
         }
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(msg, &rc);
         
@@ -3064 +3064 @@
  *
  */
-void async_data_write_void(sysarg_t retval)
+void async_data_write_void(int retval)
 {
         cap_handle_t chandle;
@@ -3102 +3102 @@
         }
         
-        sysarg_t rc;
+        int rc;
         async_wait_for(msg, &rc);