Changeset 472c09d in mainline for uspace/lib/libc/generic/async.c

Timestamp:

2010-02-03T15:18:40Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b4cbef1

Parents:

28be7fa

Message:

more consistent naming scheme:

async_data_blob_receive → async_data_receive
async_data_string_receive → async_string_receive
CLIPBOARD_TAG_BLOB → CLIPBOARD_TAG_DATA

async_data_receive can now check the granularity of the received data
async_string_receive can now return the raw size of the received data

replace several common patterns of async_data_write_receive/_finalize
with a single async_data_receive/_string_receive (this greatly improves
code readability)

File:

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

uspace/lib/libc/generic/async.c

@@ -1345 +1345 @@
 }
 
-/** Wrapper for receiving blobs via the async_data_write_*
+/** Wrapper for receiving binary data via the async_data_write_*
  *
  * This wrapper only makes it more comfortable to use async_data_write_*
  * functions to receive blobs.
  *
- * @param blob     Pointer to data pointer (which should be later disposed
- *                 by free()). If the operation fails, the pointer is not
- *                 touched.
- * @param max_size Maximum size (in bytes) of the blob to receive. 0 means
- *                 no limit.
- * @param received If not NULL, the size of the received data is stored here.
+ * @param data       Pointer to data pointer (which should be later disposed
+ *                   by free()). If the operation fails, the pointer is not
+ *                   touched.
+ * @param max_size   Maximum size (in bytes) of the data to receive. 0 means
+ *                   no limit.
+ * @param granulariy If non-zero, then the size of the received data has to
+ *                   be divisible by this value.
+ * @param received   If not NULL, the size of the received data is stored here.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
  *
  */
-int async_data_blob_receive(char **blob, const size_t max_size, size_t *received)
+int async_data_receive(void **data, const size_t max_size,
+    const size_t granularity, size_t *received)
 {
         ipc_callid_t callid;
@@ -1374 +1377 @@
         }
         
-        char *data = (char *) malloc(size);
-        if (data == NULL) {
+        if ((granularity > 0) && ((size % granularity) != 0)) {
+                ipc_answer_0(callid, EINVAL);
+                return EINVAL;
+        }
+        
+        void *_data = malloc(size);
+        if (_data == NULL) {
                 ipc_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
         
-        int rc = async_data_write_finalize(callid, data, size);
+        int rc = async_data_write_finalize(callid, _data, size);
         if (rc != EOK) {
-                free(data);
+                free(_data);
                 return rc;
         }
         
-        *blob = data;
+        *data = _data;
         if (received != NULL)
                 *received = size;
@@ -1403 +1411 @@
  * @param max_size Maximum size (in bytes) of the string to receive. 0 means
  *                 no limit.
+ * @param received If not NULL, the size of the received data is stored here.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
  *
  */
-int async_data_string_receive(char **str, const size_t max_size)
+int async_string_receive(char **str, const size_t max_size, size_t *received)
 {
         ipc_callid_t callid;
@@ -1435 +1444 @@
         data[size] = 0;
         *str = data;
+        if (received != NULL)
+                *received = size;
+        
         return EOK;
 }