Changes in uspace/lib/c/generic/async.c [f302586:36e2b55] in mainline

File:

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

uspace/lib/c/generic/async.c

@@ -118 +118 @@
 #define CONN_HASH_TABLE_BUCKETS    32
 
-/** Session data */
-struct async_sess {
-        /** List of inactive exchanges */
-        list_t exch_list;
-        
-        /** Exchange management style */
-        exch_mgmt_t mgmt;
-        
-        /** Session identification */
-        int phone;
-        
-        /** First clone connection argument */
-        sysarg_t arg1;
-        
-        /** Second clone connection argument */
-        sysarg_t arg2;
-        
-        /** Third clone connection argument */
-        sysarg_t arg3;
-        
-        /** Exchange mutex */
-        fibril_mutex_t mutex;
-        
-        /** Number of opened exchanges */
-        atomic_t refcnt;
-        
-        /** Mutex for stateful connections */
-        fibril_mutex_t remote_state_mtx;
-        
-        /** Data for stateful connections */
-        void *remote_state_data;
-};
-
-/** Exchange data */
-struct async_exch {
-        /** Link into list of inactive exchanges */
-        link_t sess_link;
-        
-        /** Link into global list of inactive exchanges */
-        link_t global_link;
-        
-        /** Session pointer */
-        async_sess_t *sess;
-        
-        /** Exchange identification */
-        int phone;
-};
-
 /** Async framework global futex */
 atomic_t async_futex = FUTEX_INITIALIZER;
@@ -182 +134 @@
         ipc_call_t call;
 } msg_t;
-
-/** Message data */
-typedef struct {
-        awaiter_t wdata;
-        
-        /** If reply was received. */
-        bool done;
-        
-        /** Pointer to where the answer data is stored. */
-        ipc_call_t *dataptr;
-        
-        sysarg_t retval;
-} amsg_t;
 
 /* Client connection data */
@@ -257 +196 @@
 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;
 }
@@ -263 +201 @@
 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;
 }
@@ -305 +242 @@
 void async_set_client_connection(async_client_conn_t conn)
 {
-        assert(client_connection == default_client_connection);
         client_connection = conn;
 }
@@ -1851 +1787 @@
         
         int rc = async_hangup_internal(sess->phone);
+        if (rc == EOK)
+                free(sess);
         
         while (!list_empty(&sess->exch_list)) {
@@ -1862 +1800 @@
                 free(exch);
         }
-
-        free(sess);
         
         fibril_mutex_unlock(&async_sess_mutex);
@@ -2001 +1937 @@
  *
  * @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, size_t size, sysarg_t arg,
-    unsigned int *flags, void **dst)
+int async_share_in_start(async_exch_t *exch, void *dst, size_t size,
+    sysarg_t arg, unsigned int *flags)
 {
         if (exch == NULL)
                 return ENOENT;
         
-        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);
+        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);
         
         if (flags)
-                *flags = (unsigned int) _flags;
-        
-        *dst = (void *) _dst;
+                *flags = (unsigned int) tmp_flags;
+        
         return res;
 }
@@ -2052 +1986 @@
                 return false;
         
-        *size = (size_t) IPC_GET_ARG1(data);
+        *size = (size_t) IPC_GET_ARG2(data);
         return true;
 }
@@ -2058 +1992 @@
 /** Wrapper for answering the IPC_M_SHARE_IN calls using the async framework.
  *
- * This wrapper only makes it more comfortable to answer IPC_M_SHARE_IN
+ * 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.
@@ -2136 +2070 @@
  *
  */
-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);