Changes in uspace/lib/c/generic/async.c [47b7006:64d2b10] in mainline

File:

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

uspace/lib/c/generic/async.c

@@ -42 +42 @@
  * You should be able to write very simple multithreaded programs, the async
  * framework will automatically take care of most synchronization problems.
+ *
+ * Default semantics:
+ * - async_send_*(): Send asynchronously. If the kernel refuses to send
+ *                   more messages, [ try to get responses from kernel, if
+ *                   nothing found, might try synchronous ]
  *
  * Example of use (pseudo C):
@@ -122 +127 @@
 
 /**
- * Structures of this type are used to group information about
- * a call and about a message queue link.
+ * Structures of this type are used to group information about a call and a
+ * message queue link.
  */
 typedef struct {
@@ -151 +156 @@
         /** Link to the client tracking structure. */
         client_t *client;
-        
+
         /** Messages that should be delivered to this fibril. */
         link_t msg_queue;
@@ -168 +173 @@
 
 /** Identifier of the incoming connection handled by the current fibril. */
-static fibril_local connection_t *FIBRIL_connection;
+fibril_local connection_t *FIBRIL_connection;
 
 static void *default_client_data_constructor(void)
@@ -197 +202 @@
 {
         assert(FIBRIL_connection);
+
         return FIBRIL_connection->client->data;
 }
 
-/** Default fibril function that gets called to handle new connection.
- *
- * This function is defined as a weak symbol - to be redefined in user code.
- *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
- */
-static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_answer_0(callid, ENOENT);
-}
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
+static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
 
 /**
@@ -217 +213 @@
  */
 static async_client_conn_t client_connection = default_client_connection;
-
-/** Default fibril function that gets called to handle interrupt notifications.
- *
- * This function is defined as a weak symbol - to be redefined in user code.
- *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
- */
-static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
-{
-}
 
 /**
@@ -240 +224 @@
 static LIST_INITIALIZE(timeout_list);
 
-#define CLIENT_HASH_TABLE_BUCKETS  32
-#define CONN_HASH_TABLE_BUCKETS    32
-
-static hash_index_t client_hash(unsigned long key[])
+#define CLIENT_HASH_TABLE_BUCKETS       32
+#define CONN_HASH_TABLE_BUCKETS         32
+
+static hash_index_t client_hash(unsigned long *key)
 {
         assert(key);
-        return (((key[0]) >> 4) % CLIENT_HASH_TABLE_BUCKETS);
+        return (((*key) >> 4) % CLIENT_HASH_TABLE_BUCKETS); 
 }
 
 static int client_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-        client_t *client = hash_table_get_instance(item, client_t, link);
-        return (key[0] == client->in_task_hash);
+        client_t *cl = hash_table_get_instance(item, client_t, link);
+        return (key[0] == cl->in_task_hash);
 }
 
@@ -273 +257 @@
  *
  */
-static hash_index_t conn_hash(unsigned long key[])
+static hash_index_t conn_hash(unsigned long *key)
 {
         assert(key);
-        return (((key[0]) >> 4) % CONN_HASH_TABLE_BUCKETS);
+        return (((*key) >> 4) % CONN_HASH_TABLE_BUCKETS);
 }
 
@@ -290 +274 @@
 static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-        connection_t *conn = hash_table_get_instance(item, connection_t, link);
-        return (key[0] == conn->in_phone_hash);
+        connection_t *hs = hash_table_get_instance(item, connection_t, link);
+        return (key[0] == hs->in_phone_hash);
 }
 
@@ -306 +290 @@
         free(hash_table_get_instance(item, connection_t, link));
 }
+
 
 /** Operations for the connection hash table. */
@@ -326 +311 @@
         link_t *tmp = timeout_list.next;
         while (tmp != &timeout_list) {
-                awaiter_t *cur
-                    = list_get_instance(tmp, awaiter_t, to_event.link);
+                awaiter_t *cur;
                 
+                cur = list_get_instance(tmp, awaiter_t, to_event.link);
                 if (tv_gteq(&cur->to_event.expires, &wd->to_event.expires))
                         break;
-                
                 tmp = tmp->next;
         }
@@ -348 +332 @@
  *
  * @return False if the call doesn't match any connection.
- * @return True if the call was passed to the respective connection fibril.
+ *         True if the call was passed to the respective connection fibril.
  *
  */
@@ -485 +469 @@
                          * the first IPC_M_PHONE_HUNGUP call and continues to
                          * call async_get_call_timeout(). Repeat
-                         * IPC_M_PHONE_HUNGUP until the caller notices.
+                         * IPC_M_PHONE_HUNGUP until the caller notices. 
                          */
                         memset(call, 0, sizeof(ipc_call_t));
@@ -492 +476 @@
                         return conn->close_callid;
                 }
-                
+
                 if (usecs)
                         async_insert_timeout(&conn->wdata);
@@ -530 +514 @@
 }
 
+/** Default fibril function that gets called to handle new connection.
+ *
+ * This function is defined as a weak symbol - to be redefined in user code.
+ *
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
+ */
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
+{
+        ipc_answer_0(callid, ENOENT);
+}
+
+/** Default fibril function that gets called to handle interrupt notifications.
+ *
+ * This function is defined as a weak symbol - to be redefined in user code.
+ *
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
+ */
+static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+{
+}
+
 /** Wrapper for client connection fibril.
  *
@@ -542 +551 @@
 static int connection_fibril(void *arg)
 {
+        unsigned long key;
+        client_t *cl;
+        link_t *lnk;
+        bool destroy = false;
+
         /*
          * Setup fibril-local connection pointer.
          */
         FIBRIL_connection = (connection_t *) arg;
-        
-        futex_down(&async_futex);
-        
+
         /*
          * Add our reference for the current connection in the client task
@@ -554 +566 @@
          * hash in a new tracking structure.
          */
-        
-        unsigned long key = FIBRIL_connection->in_task_hash;
-        link_t *lnk = hash_table_find(&client_hash_table, &key);
-        
-        client_t *client;
-        
+        futex_down(&async_futex);
+        key = FIBRIL_connection->in_task_hash;
+        lnk = hash_table_find(&client_hash_table, &key);
         if (lnk) {
-                client = hash_table_get_instance(lnk, client_t, link);
-                client->refcnt++;
+                cl = hash_table_get_instance(lnk, client_t, link);
+                cl->refcnt++;
         } else {
-                client = malloc(sizeof(client_t));
-                if (!client) {
+                cl = malloc(sizeof(client_t));
+                if (!cl) {
                         ipc_answer_0(FIBRIL_connection->callid, ENOMEM);
                         futex_up(&async_futex);
                         return 0;
                 }
-                
-                client->in_task_hash = FIBRIL_connection->in_task_hash;
-                
+                cl->in_task_hash = FIBRIL_connection->in_task_hash;
                 async_serialize_start();
-                client->data = async_client_data_create();
+                cl->data = async_client_data_create();
                 async_serialize_end();
-                
-                client->refcnt = 1;
-                hash_table_insert(&client_hash_table, &key, &client->link);
-        }
-        
+                cl->refcnt = 1;
+                hash_table_insert(&client_hash_table, &key, &cl->link);
+        }
         futex_up(&async_futex);
-        
-        FIBRIL_connection->client = client;
-        
+
+        FIBRIL_connection->client = cl;
+
         /*
          * Call the connection handler function.
@@ -594 +599 @@
          * Remove the reference for this client task connection.
          */
-        bool destroy;
-        
         futex_down(&async_futex);
-        
-        if (--client->refcnt == 0) {
+        if (--cl->refcnt == 0) {
                 hash_table_remove(&client_hash_table, &key, 1);
                 destroy = true;
-        } else
-                destroy = false;
-        
+        }
         futex_up(&async_futex);
-        
+
         if (destroy) {
-                if (client->data)
-                        async_client_data_destroy(client->data);
-                
-                free(client);
-        }
-        
+                if (cl->data)
+                        async_client_data_destroy(cl->data);
+                free(cl);
+        }
+
         /*
          * Remove myself from the connection hash table.
@@ -625 +624 @@
          */
         while (!list_empty(&FIBRIL_connection->msg_queue)) {
-                msg_t *msg =
-                    list_get_instance(FIBRIL_connection->msg_queue.next, msg_t,
-                    link);
+                msg_t *msg;
                 
+                msg = list_get_instance(FIBRIL_connection->msg_queue.next,
+                    msg_t, link);
                 list_remove(&msg->link);
                 ipc_answer_0(msg->callid, EHANGUP);
@@ -671 +670 @@
                 if (callid)
                         ipc_answer_0(callid, ENOMEM);
-                
                 return (uintptr_t) NULL;
         }
@@ -719 +717 @@
 static void handle_call(ipc_callid_t callid, ipc_call_t *call)
 {
-        /* Unrouted call - take some default action */
+        /* Unrouted call - do some default behaviour */
         if ((callid & IPC_CALLID_NOTIFICATION)) {
                 process_notification(callid, call);
-                return;
+                goto out;
         }
         
@@ -728 +726 @@
         case IPC_M_CONNECT_ME:
         case IPC_M_CONNECT_ME_TO:
-                /* Open new connection with fibril, etc. */
+                /* Open new connection with fibril etc. */
                 async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
                     callid, call, client_connection);
-                return;
+                goto out;
         }
         
         /* Try to route the call through the connection hash table */
         if (route_call(callid, call))
-                return;
+                goto out;
         
         /* Unknown call from unknown phone - hang it up */
         ipc_answer_0(callid, EHANGUP);
+        return;
+        
+out:
+        ;
 }
 
@@ -752 +754 @@
         link_t *cur = timeout_list.next;
         while (cur != &timeout_list) {
-                awaiter_t *waiter =
-                    list_get_instance(cur, awaiter_t, to_event.link);
+                awaiter_t *waiter;
                 
+                waiter = list_get_instance(cur, awaiter_t, to_event.link);
                 if (tv_gt(&waiter->to_event.expires, &tv))
                         break;
-                
+
                 cur = cur->next;
-                
+
                 list_remove(&waiter->to_event.link);
                 waiter->to_event.inlist = false;
@@ -786 +788 @@
         while (true) {
                 if (fibril_switch(FIBRIL_FROM_MANAGER)) {
-                        futex_up(&async_futex);
+                        futex_up(&async_futex); 
                         /*
                          * async_futex is always held when entering a manager
@@ -809 +811 @@
                                 continue;
                         } else
-                                timeout = tv_sub(&waiter->to_event.expires, &tv);
+                                timeout = tv_sub(&waiter->to_event.expires,
+                                    &tv);
                 } else
                         timeout = SYNCH_NO_TIMEOUT;
                 
                 futex_up(&async_futex);
-                
+
                 atomic_inc(&threads_in_ipc_wait);
                 
@@ -822 +825 @@
                 
                 atomic_dec(&threads_in_ipc_wait);
-                
+
                 if (!callid) {
                         handle_expired_timeouts();
@@ -872 +875 @@
 /** Initialize the async framework.
  *
- */
-void __async_init(void)
+ * @return Zero on success or an error code.
+ */
+int __async_init(void)
 {
         if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS, 1,
-            &client_hash_table_ops))
-                abort();
-        
-        if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_BUCKETS, 1,
-            &conn_hash_table_ops))
-                abort();
+            &client_hash_table_ops) || !hash_table_create(&conn_hash_table,
+            CONN_HASH_TABLE_BUCKETS, 1, &conn_hash_table_ops)) {
+                return ENOMEM;
+        }
+
+        _async_sess_init();
+        
+        return 0;
 }
 
@@ -894 +900 @@
  * @param retval Value returned in the answer.
  * @param data   Call data of the answer.
- *
  */
 static void reply_received(void *arg, int retval, ipc_call_t *data)
@@ -942 +947 @@
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
 {
-        amsg_t *msg = malloc(sizeof(amsg_t));
+        amsg_t *msg = malloc(sizeof(*msg));
         
         if (!msg)
@@ -951 +956 @@
         
         msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
+        /* We may sleep in the next method, but it will use its own mechanism */
         msg->wdata.active = true;
         
@@ -986 +987 @@
     ipc_call_t *dataptr)
 {
-        amsg_t *msg = malloc(sizeof(amsg_t));
+        amsg_t *msg = malloc(sizeof(*msg));
         
         if (!msg)
@@ -995 +996 @@
         
         msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
+        /* We may sleep in next method, but it will use its own mechanism */
         msg->wdata.active = true;
         
@@ -1098 +1095 @@
 void async_usleep(suseconds_t timeout)
 {
-        amsg_t *msg = malloc(sizeof(amsg_t));
+        amsg_t *msg = malloc(sizeof(*msg));
         
         if (!msg)
@@ -1310 +1307 @@
 }
 
-int async_forward_fast(ipc_callid_t callid, int phoneid, sysarg_t imethod,
-    sysarg_t arg1, sysarg_t arg2, unsigned int mode)
+int async_forward_fast(ipc_callid_t callid, int phoneid, int imethod,
+    sysarg_t arg1, sysarg_t arg2, int mode)
 {
         return ipc_forward_fast(callid, phoneid, imethod, arg1, arg2, mode);
 }
 
-int async_forward_slow(ipc_callid_t callid, int phoneid, sysarg_t imethod,
+int async_forward_slow(ipc_callid_t callid, int phoneid, int imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
-    unsigned int mode)
+    int mode)
 {
         return ipc_forward_slow(callid, phoneid, imethod, arg1, arg2, arg3, arg4,
@@ -1431 +1428 @@
 }
 
-/** Wrapper for IPC_M_SHARE_IN calls using the async framework.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param dst     Destination address space area base.
- * @param size    Size of the destination address space area.
- * @param arg     User defined argument.
- * @param flags   Storage for the received flags. Can be NULL.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
+/** Wrapper for making IPC_M_SHARE_IN calls using the async framework.
+ *
+ * @param phoneid       Phone that will be used to contact the receiving side.
+ * @param dst           Destination address space area base.
+ * @param size          Size of the destination address space area.
+ * @param arg           User defined argument.
+ * @param flags         Storage where the received flags will be stored. Can be
+ *                      NULL.
+ *
+ * @return              Zero on success or a negative error code from errno.h.
  */
 int async_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
-    unsigned int *flags)
-{
+    int *flags)
+{
+        int res;
         sysarg_t tmp_flags;
-        int res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
+        res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
             (sysarg_t) size, arg, NULL, &tmp_flags);
-        
         if (flags)
-                *flags = (unsigned int) tmp_flags;
-        
+                *flags = tmp_flags;
         return res;
 }
@@ -1457 +1453 @@
 /** Wrapper for receiving the IPC_M_SHARE_IN calls using the async framework.
  *
- * This wrapper only makes it more comfortable to receive IPC_M_SHARE_IN
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
+ * This wrapper only makes it more comfortable to receive IPC_M_SHARE_IN calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * So far, this wrapper is to be used from within a connection fibril.
  *
- * @param callid Storage for the hash of the IPC_M_SHARE_IN call.
- * @param size   Destination address space area size.
- *
- * @return True on success, false on failure.
- *
- */
-bool async_share_in_receive(ipc_callid_t *callid, size_t *size)
-{
+ * @param callid        Storage where the hash of the IPC_M_SHARE_IN call will
+ *                      be stored.
+ * @param size          Destination address space area size.    
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int async_share_in_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
         assert(callid);
         assert(size);
-        
-        ipc_call_t data;
+
         *callid = async_get_call(&data);
-        
         if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_IN)
-                return false;
-        
+                return 0;
         *size = (size_t) IPC_GET_ARG2(data);
-        return true;
+        return 1;
 }
 
 /** Wrapper for answering the IPC_M_SHARE_IN calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
- *
- * @param callid Hash of the IPC_M_DATA_READ call to answer.
- * @param src    Source address space base.
- * @param flags  Flags to be used for sharing. Bits can be only cleared.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int async_share_in_finalize(ipc_callid_t callid, void *src, unsigned int flags)
+ * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * @param callid        Hash of the IPC_M_DATA_READ call to answer.
+ * @param src           Source address space base.
+ * @param flags         Flags to be used for sharing. Bits can be only cleared.
+ *
+ * @return              Zero on success or a value from @ref errno.h on failure.
+ */
+int async_share_in_finalize(ipc_callid_t callid, void *src, int flags)
 {
         return ipc_share_in_finalize(callid, src, flags);
 }
 
-/** Wrapper for IPC_M_SHARE_OUT calls using the async framework.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param src     Source address space area base address.
- * @param flags   Flags to be used for sharing. Bits can be only cleared.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
- */
-int async_share_out_start(int phoneid, void *src, unsigned int flags)
+/** Wrapper for making IPC_M_SHARE_OUT calls using the async framework.
+ *
+ * @param phoneid       Phone that will be used to contact the receiving side.
+ * @param src           Source address space area base address.
+ * @param flags         Flags to be used for sharing. Bits can be only cleared.
+ *
+ * @return              Zero on success or a negative error code from errno.h.
+ */
+int async_share_out_start(int phoneid, void *src, int flags)
 {
         return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
@@ -1519 +1510 @@
 /** Wrapper for receiving the IPC_M_SHARE_OUT calls using the async framework.
  *
- * This wrapper only makes it more comfortable to receive IPC_M_SHARE_OUT
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
+ * This wrapper only makes it more comfortable to receive IPC_M_SHARE_OUT calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * So far, this wrapper is to be used from within a connection fibril.
  *
- * @param callid Storage for the hash of the IPC_M_SHARE_OUT call.
- * @param size   Storage for the source address space area size.
- * @param flags  Storage for the sharing flags.
- *
- * @return True on success, false on failure.
- *
- */
-bool async_share_out_receive(ipc_callid_t *callid, size_t *size, unsigned int *flags)
-{
+ * @param callid        Storage where the hash of the IPC_M_SHARE_OUT call will
+ *                      be stored.
+ * @param size          Storage where the source address space area size will be
+ *                      stored.
+ * @param flags         Storage where the sharing flags will be stored.
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int async_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags)
+{
+        ipc_call_t data;
+        
         assert(callid);
         assert(size);
         assert(flags);
-        
-        ipc_call_t data;
+
         *callid = async_get_call(&data);
-        
         if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_OUT)
-                return false;
-        
+                return 0;
         *size = (size_t) IPC_GET_ARG2(data);
-        *flags = (unsigned int) IPC_GET_ARG3(data);
-        return true;
+        *flags = (int) IPC_GET_ARG3(data);
+        return 1;
 }
 
 /** Wrapper for answering the IPC_M_SHARE_OUT calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_SHARE_OUT
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
- *
- * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
- * @param dst    Destination address space area base address.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
+ * This wrapper only makes it more comfortable to answer IPC_M_SHARE_OUT calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * @param callid        Hash of the IPC_M_DATA_WRITE call to answer.
+ * @param dst           Destination address space area base address.    
+ *
+ * @return              Zero on success or a value from @ref errno.h on failure.
  */
 int async_share_out_finalize(ipc_callid_t callid, void *dst)
@@ -1566 +1554 @@
 }
 
-/** Wrapper for IPC_M_DATA_READ calls using the async framework.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param dst     Address of the beginning of the destination buffer.
- * @param size    Size of the destination buffer.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
+
+/** Wrapper for making IPC_M_DATA_READ calls using the async framework.
+ *
+ * @param phoneid       Phone that will be used to contact the receiving side.
+ * @param dst           Address of the beginning of the destination buffer.
+ * @param size          Size of the destination buffer.
+ *
+ * @return              Zero on success or a negative error code from errno.h.
  */
 int async_data_read_start(int phoneid, void *dst, size_t size)
@@ -1583 +1571 @@
 /** Wrapper for receiving the IPC_M_DATA_READ calls using the async framework.
  *
- * This wrapper only makes it more comfortable to receive IPC_M_DATA_READ
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_READ calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * So far, this wrapper is to be used from within a connection fibril.
  *
- * @param callid Storage for the hash of the IPC_M_DATA_READ.
- * @param size   Storage for the maximum size. Can be NULL.
- *
- * @return True on success, false on failure.
- *
- */
-bool async_data_read_receive(ipc_callid_t *callid, size_t *size)
-{
+ * @param callid        Storage where the hash of the IPC_M_DATA_READ call will
+ *                      be stored.
+ * @param size          Storage where the maximum size will be stored. Can be
+ *                      NULL.
+ *
+ * @return              Non-zero on success, zero on failure.
+ */
+int async_data_read_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
         assert(callid);
-        
-        ipc_call_t data;
+
         *callid = async_get_call(&data);
-        
         if (IPC_GET_IMETHOD(data) != IPC_M_DATA_READ)
-                return false;
-        
+                return 0;
         if (size)
                 *size = (size_t) IPC_GET_ARG2(data);
-        
-        return true;
+        return 1;
 }
 
 /** Wrapper for answering the IPC_M_DATA_READ calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
- *
- * @param callid Hash of the IPC_M_DATA_READ call to answer.
- * @param src    Source address for the IPC_M_DATA_READ call.
- * @param size   Size for the IPC_M_DATA_READ call. Can be smaller than
- *               the maximum size announced by the sender.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
+ * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
+ *
+ * @param callid        Hash of the IPC_M_DATA_READ call to answer.
+ * @param src           Source address for the IPC_M_DATA_READ call.
+ * @param size          Size for the IPC_M_DATA_READ call. Can be smaller than
+ *                      the maximum size announced by the sender.
+ *
+ * @return              Zero on success or a value from @ref errno.h on failure.
  */
 int async_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
@@ -1663 +1647 @@
 }
 
-/** Wrapper for IPC_M_DATA_WRITE calls using the async framework.
+/** Wrapper for making IPC_M_DATA_WRITE calls using the async framework.
  *
  * @param phoneid Phone that will be used to contact the receiving side.
@@ -1680 +1664 @@
 /** Wrapper for receiving the IPC_M_DATA_WRITE calls using the async framework.
  *
- * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * So far, this wrapper is to be used from within a connection fibril.
  *
- * @param callid Storage for the hash of the IPC_M_DATA_WRITE.
- * @param size   Storage for the suggested size. May be NULL.
- *
- * @return True on success, false on failure.
- *
- */
-bool async_data_write_receive(ipc_callid_t *callid, size_t *size)
-{
+ * @param callid Storage where the hash of the IPC_M_DATA_WRITE call will
+ *               be stored.
+ * @param size   Storage where the suggested size will be stored. May be
+ *               NULL
+ *
+ * @return Non-zero on success, zero on failure.
+ *
+ */
+int async_data_write_receive(ipc_callid_t *callid, size_t *size)
+{
+        ipc_call_t data;
+        
         assert(callid);
         
-        ipc_call_t data;
         *callid = async_get_call(&data);
-        
         if (IPC_GET_IMETHOD(data) != IPC_M_DATA_WRITE)
-                return false;
+                return 0;
         
         if (size)
                 *size = (size_t) IPC_GET_ARG2(data);
         
-        return true;
+        return 1;
 }
 
 /** Wrapper for answering the IPC_M_DATA_WRITE calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE
- * calls so that the user doesn't have to remember the meaning of each IPC
- * argument.
+ * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE calls
+ * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
@@ -1808 +1792 @@
  *
  */
-void async_data_write_void(sysarg_t retval)
+void async_data_write_void(const int retval)
 {
         ipc_callid_t callid;