Changeset d054ad3 in mainline for uspace/lib/c/generic/async/client.c

Timestamp:

2018-07-09T18:36:33Z (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:

2d56e2e

Parents:

87337dc5

git-author:

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

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-09 18:36:33)

Message:

Remove the obsolete callback abstraction from low level IPC.

File:

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

uspace/lib/c/generic/async/client.c

@@ -241 +241 @@
  *
  */
-static void reply_received(void *arg, errno_t retval, ipc_call_t *data)
-{
-        assert(arg);
+void async_reply_received(ipc_call_t *data)
+{
+        amsg_t *msg = data->label;
+        if (!msg)
+                return;
 
         futex_lock(&async_futex);
 
-        amsg_t *msg = (amsg_t *) arg;
-        msg->retval = retval;
+        msg->retval = IPC_GET_RETVAL(*data);
 
         /* Copy data after futex_down, just in case the call was detached */
@@ -302 +303 @@
         msg->wdata.active = true;
 
-        ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, msg,
-            reply_received);
+        errno_t rc = ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3,
+            arg4, msg);
+        if (rc != EOK) {
+                msg->retval = rc;
+                msg->done = true;
+        }
 
         return (aid_t) msg;
@@ -340 +345 @@
         msg->wdata.active = true;
 
-        ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, arg5,
-            msg, reply_received);
+        errno_t rc = ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3,
+            arg4, arg5, msg);
+        if (rc != EOK) {
+                msg->retval = rc;
+                msg->done = true;
+        }
 
         return (aid_t) msg;
@@ -653 +662 @@
 {
         if (exch != NULL)
-                ipc_call_async_0(exch->phone, imethod, NULL, NULL);
+                ipc_call_async_0(exch->phone, imethod, NULL);
 }
 
@@ -659 +668 @@
 {
         if (exch != NULL)
-                ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL);
+                ipc_call_async_1(exch->phone, imethod, arg1, NULL);
 }
 
@@ -666 +675 @@
 {
         if (exch != NULL)
-                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL);
+                ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL);
 }
 
@@ -673 +682 @@
 {
         if (exch != NULL)
-                ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL,
-                    NULL);
+                ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL);
 }
 
@@ -682 +690 @@
         if (exch != NULL)
                 ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    NULL, NULL);
+                    NULL);
 }
 
@@ -690 +698 @@
         if (exch != NULL)
                 ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4,
-                    arg5, NULL, NULL);
+                    arg5, NULL);
 }
 
@@ -710 +718 @@
         msg->wdata.active = true;
 
-        ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, (sysarg_t) iface, arg2,
-            arg3, flags, msg, reply_received);
-
-        errno_t rc;
+        errno_t rc = ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO,
+            (sysarg_t) iface, arg2, arg3, flags, msg);
+        if (rc != EOK) {
+                msg->retval = rc;
+                msg->done = true;
+        }
+
         async_wait_for((aid_t) msg, &rc);