Changeset b7068da in mainline for uspace/lib/c/generic/async.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/lib/c/generic/async.c

@@ -257 +257 @@
 void async_set_client_data_constructor(async_client_data_ctor_t ctor)
 {
+        assert(async_client_data_create == default_client_data_constructor);
         async_client_data_create = ctor;
 }
@@ -262 +263 @@
 void async_set_client_data_destructor(async_client_data_dtor_t dtor)
 {
+        assert(async_client_data_destroy == default_client_data_destructor);
         async_client_data_destroy = dtor;
 }
@@ -303 +305 @@
 void async_set_client_connection(async_client_conn_t conn)
 {
+        assert(client_connection == default_client_connection);
         client_connection = conn;
 }
@@ -1846 +1849 @@
         
         fibril_mutex_lock(&async_sess_mutex);
-
+        
         int rc = async_hangup_internal(sess->phone);
         
@@ -1998 +2001 @@
  *
  * @param exch  Exchange for sending the message.
- * @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.
+ * @param dst   Destination address space area base. Cannot be NULL.
  *
  * @return Zero on success or a negative error code from errno.h.
  *
  */
-int async_share_in_start(async_exch_t *exch, void *dst, size_t size,
-    sysarg_t arg, unsigned int *flags)
+int async_share_in_start(async_exch_t *exch, size_t size, sysarg_t arg,
+    unsigned int *flags, void **dst)
 {
         if (exch == NULL)
                 return ENOENT;
         
-        sysarg_t tmp_flags;
-        int res = async_req_3_2(exch, IPC_M_SHARE_IN, (sysarg_t) dst,
-            (sysarg_t) size, arg, NULL, &tmp_flags);
+        sysarg_t _flags = 0;
+        sysarg_t _dst = (sysarg_t) -1;
+        int res = async_req_2_4(exch, IPC_M_SHARE_IN, (sysarg_t) size,
+            arg, NULL, &_flags, NULL, &_dst);
         
         if (flags)
-                *flags = (unsigned int) tmp_flags;
-        
+                *flags = (unsigned int) _flags;
+        
+        *dst = (void *) _dst;
         return res;
 }
@@ -2047 +2052 @@
                 return false;
         
-        *size = (size_t) IPC_GET_ARG2(data);
+        *size = (size_t) IPC_GET_ARG1(data);
         return true;
 }
@@ -2053 +2058 @@
 /** 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
+ * This wrapper only makes it more comfortable to answer IPC_M_SHARE_IN
  * calls so that the user doesn't have to remember the meaning of each IPC
  * argument.
@@ -2131 +2136 @@
  *
  */
-int async_share_out_finalize(ipc_callid_t callid, void *dst)
+int async_share_out_finalize(ipc_callid_t callid, void **dst)
 {
         return ipc_share_out_finalize(callid, dst);