Changes in uspace/lib/c/generic/async/server.c [fec7ba0:5e801dc] in mainline

File:

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

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

@@ -96 +96 @@
  */
 
-#define LIBC_ASYNC_C_
+#define _LIBC_ASYNC_C_
 #include <ipc/ipc.h>
 #include <async.h>
 #include "../private/async.h"
-#undef LIBC_ASYNC_C_
+#undef _LIBC_ASYNC_C_
 
 #include <ipc/irq.h>
@@ -231 +231 @@
 static sysarg_t notification_avail = 0;
 
-static size_t client_key_hash(void *key)
-{
-        task_id_t in_task_id = *(task_id_t *) key;
-        return in_task_id;
+static size_t client_key_hash(const void *key)
+{
+        const task_id_t *in_task_id = key;
+        return *in_task_id;
 }
 
@@ -243 +243 @@
 }
 
-static bool client_key_equal(void *key, const ht_link_t *item)
-{
-        task_id_t in_task_id = *(task_id_t *) key;
+static bool client_key_equal(const void *key, const ht_link_t *item)
+{
+        const task_id_t *in_task_id = key;
         client_t *client = hash_table_get_inst(item, client_t, link);
-        return in_task_id == client->in_task_id;
+        return *in_task_id == client->in_task_id;
 }
 
@@ -490 +490 @@
 }
 
-static size_t notification_key_hash(void *key)
-{
-        sysarg_t id = *(sysarg_t *) key;
-        return id;
+static size_t notification_key_hash(const void *key)
+{
+        const sysarg_t *id = key;
+        return *id;
 }
 
@@ -503 +503 @@
 }
 
-static bool notification_key_equal(void *key, const ht_link_t *item)
-{
-        sysarg_t id = *(sysarg_t *) key;
+static bool notification_key_equal(const void *key, const ht_link_t *item)
+{
+        const sysarg_t *id = key;
         notification_t *notification =
             hash_table_get_inst(item, notification_t, htlink);
-        return id == notification->imethod;
+        return *id == notification->imethod;
 }
 
@@ -546 +546 @@
         errno_t rc = mpsc_send(conn->msg_channel, call);
 
-        if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP) {
+        if (ipc_get_imethod(call) == IPC_M_PHONE_HUNGUP) {
                 /* Close the channel, but let the connection fibril answer. */
                 mpsc_close(conn->msg_channel);
@@ -656 +656 @@
         }
 
-        ht_link_t *link = hash_table_find(&notification_hash_table,
-            &IPC_GET_IMETHOD(*call));
+        sysarg_t imethod = ipc_get_imethod(call);
+        ht_link_t *link = hash_table_find(&notification_hash_table, &imethod);
         if (!link) {
                 /* Invalid notification. */
@@ -871 +871 @@
 
                 memset(call, 0, sizeof(ipc_call_t));
-                IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
+                ipc_set_imethod(call, IPC_M_PHONE_HUNGUP);
                 call->cap_handle = CAP_NIL;
         }
 
         return true;
+}
+
+bool async_get_call(ipc_call_t *call)
+{
+        return async_get_call_timeout(call, 0);
 }
 
@@ -939 +944 @@
 
         /* New connection */
-        if (IPC_GET_IMETHOD(*call) == IPC_M_CONNECT_ME_TO) {
+        if (ipc_get_imethod(call) == IPC_M_CONNECT_ME_TO) {
                 connection_t *conn = calloc(1, sizeof(*conn));
                 if (!conn) {
@@ -946 +951 @@
                 }
 
-                iface_t iface = (iface_t) IPC_GET_ARG1(*call);
+                iface_t iface = (iface_t) ipc_get_arg1(call);
 
                 // TODO: Currently ignores all ports but the first one.
@@ -1096 +1101 @@
 }
 
-errno_t async_forward_fast(ipc_call_t *call, async_exch_t *exch,
+static errno_t async_forward_fast(ipc_call_t *call, async_exch_t *exch,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
@@ -1112 +1117 @@
 }
 
-errno_t async_forward_slow(ipc_call_t *call, async_exch_t *exch,
+static errno_t async_forward_slow(ipc_call_t *call, async_exch_t *exch,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     sysarg_t arg4, sysarg_t arg5, unsigned int mode)
@@ -1127 +1132 @@
         return ipc_forward_slow(chandle, exch->phone, imethod, arg1, arg2, arg3,
             arg4, arg5, mode);
+}
+
+errno_t async_forward_0(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    unsigned int mode)
+{
+        return async_forward_fast(call, exch, imethod, 0, 0, mode);
+}
+
+errno_t async_forward_1(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, unsigned int mode)
+{
+        return async_forward_fast(call, exch, imethod, arg1, 0, mode);
+}
+
+errno_t async_forward_2(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, unsigned int mode)
+{
+        return async_forward_fast(call, exch, imethod, arg1, arg2, mode);
+}
+
+errno_t async_forward_3(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, unsigned int mode)
+{
+        return async_forward_slow(call, exch, imethod, arg1, arg2, arg3, 0, 0,
+            mode);
+}
+
+errno_t async_forward_4(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
+    unsigned int mode)
+{
+        return async_forward_slow(call, exch, imethod, arg1, arg2, arg3, arg4,
+            0, mode);
+}
+
+errno_t async_forward_5(ipc_call_t *call, async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
+    unsigned int mode)
+{
+        return async_forward_slow(call, exch, imethod, arg1, arg2, arg3, arg4,
+            arg5, mode);
 }
 
@@ -1175 +1221 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_SHARE_IN)
+        if (ipc_get_imethod(call) != IPC_M_SHARE_IN)
                 return false;
 
-        *size = (size_t) IPC_GET_ARG1(*call);
+        *size = (size_t) ipc_get_arg1(call);
         return true;
 }
@@ -1230 +1276 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_SHARE_OUT)
+        if (ipc_get_imethod(call) != IPC_M_SHARE_OUT)
                 return false;
 
-        *size = (size_t) IPC_GET_ARG2(*call);
-        *flags = (unsigned int) IPC_GET_ARG3(*call);
+        *size = (size_t) ipc_get_arg2(call);
+        *flags = (unsigned int) ipc_get_arg3(call);
         return true;
 }
@@ -1283 +1329 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_DATA_READ)
+        if (ipc_get_imethod(call) != IPC_M_DATA_READ)
                 return false;
 
         if (size)
-                *size = (size_t) IPC_GET_ARG2(*call);
+                *size = (size_t) ipc_get_arg2(call);
 
         return true;
@@ -1320 +1366 @@
  *
  */
-errno_t async_data_read_forward_fast(async_exch_t *exch, sysarg_t imethod,
+static errno_t async_data_read_forward_fast(async_exch_t *exch, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
     ipc_call_t *dataptr)
@@ -1333 +1379 @@
         }
 
-        aid_t msg = async_send_fast(exch, imethod, arg1, arg2, arg3, arg4,
+        aid_t msg = async_send_4(exch, imethod, arg1, arg2, arg3, arg4,
             dataptr);
         if (msg == 0) {
@@ -1354 +1400 @@
 }
 
+errno_t async_data_read_forward_0_0(async_exch_t *exch, sysarg_t imethod)
+{
+        return async_data_read_forward_fast(exch, imethod, 0, 0, 0, 0, NULL);
+}
+
+errno_t async_data_read_forward_1_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, 0, 0, 0, NULL);
+}
+
+errno_t async_data_read_forward_2_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, 0,
+            0, NULL);
+}
+
+errno_t async_data_read_forward_3_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, arg3,
+            0, NULL);
+}
+
+errno_t async_data_read_forward_4_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, arg3,
+            arg4, NULL);
+}
+
+errno_t async_data_read_forward_0_1(async_exch_t *exch, sysarg_t imethod,
+    ipc_call_t *dataptr)
+{
+        return async_data_read_forward_fast(exch, imethod, 0, 0, 0,
+            0, dataptr);
+}
+
+errno_t async_data_read_forward_1_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, ipc_call_t *dataptr)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, 0, 0,
+            0, dataptr);
+}
+
+errno_t async_data_read_forward_2_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, ipc_call_t *dataptr)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, 0,
+            0, dataptr);
+}
+
+errno_t async_data_read_forward_3_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_call_t *dataptr)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, arg3,
+            0, dataptr);
+}
+
+errno_t async_data_read_forward_4_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
+    ipc_call_t *dataptr)
+{
+        return async_data_read_forward_fast(exch, imethod, arg1, arg2, arg3,
+            arg4, dataptr);
+}
+
 /** Wrapper for receiving the IPC_M_DATA_WRITE calls using the async framework.
  *
@@ -1374 +1488 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_DATA_WRITE)
+        if (ipc_get_imethod(call) != IPC_M_DATA_WRITE)
                 return false;
 
         if (size)
-                *size = (size_t) IPC_GET_ARG2(*call);
+                *size = (size_t) ipc_get_arg2(call);
 
         return true;
@@ -1497 +1611 @@
  *
  */
-errno_t async_data_write_forward_fast(async_exch_t *exch, sysarg_t imethod,
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
-    ipc_call_t *dataptr)
+static errno_t async_data_write_forward_fast(async_exch_t *exch,
+    sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
+    sysarg_t arg4, ipc_call_t *dataptr)
 {
         if (exch == NULL)
@@ -1510 +1624 @@
         }
 
-        aid_t msg = async_send_fast(exch, imethod, arg1, arg2, arg3, arg4,
+        aid_t msg = async_send_4(exch, imethod, arg1, arg2, arg3, arg4,
             dataptr);
         if (msg == 0) {
@@ -1531 +1645 @@
 }
 
+errno_t async_data_write_forward_0_0(async_exch_t *exch, sysarg_t imethod)
+{
+        return async_data_write_forward_fast(exch, imethod, 0, 0, 0,
+            0, NULL);
+}
+
+errno_t async_data_write_forward_1_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, 0, 0,
+            0, NULL);
+}
+
+errno_t async_data_write_forward_2_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, 0,
+            0, NULL);
+}
+
+errno_t async_data_write_forward_3_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, arg3,
+            0, NULL);
+}
+
+errno_t async_data_write_forward_4_0(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, arg3,
+            arg4, NULL);
+}
+
+errno_t async_data_write_forward_0_1(async_exch_t *exch, sysarg_t imethod,
+    ipc_call_t *dataptr)
+{
+        return async_data_write_forward_fast(exch, imethod, 0, 0, 0,
+            0, dataptr);
+}
+
+errno_t async_data_write_forward_1_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, ipc_call_t *dataptr)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, 0, 0,
+            0, dataptr);
+}
+
+errno_t async_data_write_forward_2_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, ipc_call_t *dataptr)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, 0,
+            0, dataptr);
+}
+
+errno_t async_data_write_forward_3_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_call_t *dataptr)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, arg3,
+            0, dataptr);
+}
+
+errno_t async_data_write_forward_4_1(async_exch_t *exch, sysarg_t imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4,
+    ipc_call_t *dataptr)
+{
+        return async_data_write_forward_fast(exch, imethod, arg1, arg2, arg3,
+            arg4, dataptr);
+}
+
 /** Wrapper for receiving the IPC_M_CONNECT_TO_ME calls.
  *
@@ -1548 +1732 @@
         async_get_call(&call);
 
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call);
-
-        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle))) {
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(&call);
+
+        if ((ipc_get_imethod(&call) != IPC_M_CONNECT_TO_ME) ||
+            !cap_handle_valid((phandle))) {
                 async_answer_0(&call, EINVAL);
                 return NULL;
@@ -1592 +1776 @@
 async_sess_t *async_callback_receive_start(exch_mgmt_t mgmt, ipc_call_t *call)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(*call);
-
-        if ((IPC_GET_IMETHOD(*call) != IPC_M_CONNECT_TO_ME) ||
-            !CAP_HANDLE_VALID((phandle)))
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(call);
+
+        if ((ipc_get_imethod(call) != IPC_M_CONNECT_TO_ME) ||
+            !cap_handle_valid((phandle)))
                 return NULL;
 
@@ -1619 +1803 @@
         async_get_call(call);
 
-        if (IPC_GET_IMETHOD(*call) != IPC_M_STATE_CHANGE_AUTHORIZE)
+        if (ipc_get_imethod(call) != IPC_M_STATE_CHANGE_AUTHORIZE)
                 return false;
 
@@ -1629 +1813 @@
         assert(call);
 
-        return async_answer_1(call, EOK, CAP_HANDLE_RAW(other_exch->phone));
+        return async_answer_1(call, EOK, cap_handle_raw(other_exch->phone));
 }