Changes in uspace/lib/c/include/async.h [93ad49a8:8869f7b] in mainline

File:

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

uspace/lib/c/include/async.h

@@ -42 +42 @@
 #include <ipc/common.h>
 #include <fibril.h>
+#include <fibril_synch.h>
 #include <sys/time.h>
 #include <atomic.h>
@@ -52 +53 @@
 typedef void (*async_client_data_dtor_t)(void *);
 
-/** Client connection handler
- *
- * @param callid ID of incoming call or 0 if connection initiated from
- *               inside using async_connect_to_me()
- * @param call   Incoming call or 0 if connection initiated from inside
- * @param arg    Local argument passed from async_new_connection() or
- *               async_connect_to_me()
- */
-typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *, void *);
-
-/** Interrupt handler */
-typedef void (*async_interrupt_handler_t)(ipc_callid_t, ipc_call_t *);
+typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *);
 
 /** Exchange management style
@@ -95 +85 @@
 } exch_mgmt_t;
 
-/** Forward declarations */
-struct _async_exch;
-struct _async_sess;
-
-typedef struct _async_sess async_sess_t;
-typedef struct _async_exch async_exch_t;
+/** Session data */
+typedef struct {
+        /** List of inactive exchanges */
+        link_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;
+} async_sess_t;
+
+/** Exchange data */
+typedef struct {
+        /** 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_exch_t;
 
 extern atomic_t threads_in_ipc_wait;
@@ -140 +165 @@
 extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t);
 
-extern fid_t async_new_connection(task_id_t, sysarg_t, ipc_callid_t,
-    ipc_call_t *, async_client_conn_t, void *);
+extern fid_t async_new_connection(sysarg_t, sysarg_t, ipc_callid_t,
+    ipc_call_t *, async_client_conn_t);
 
 extern void async_usleep(suseconds_t);
@@ -150 +175 @@
 extern void async_set_client_data_destructor(async_client_data_dtor_t);
 extern void *async_get_client_data(void);
-extern void *async_get_client_data_by_id(task_id_t);
-extern void async_put_client_data_by_id(task_id_t);
 
 extern void async_set_client_connection(async_client_conn_t);
-extern void async_set_interrupt_received(async_interrupt_handler_t);
+extern void async_set_interrupt_received(async_client_conn_t);
 
 /*
@@ -328 +351 @@
 
 extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t, void *);
+    async_client_conn_t);
 
 extern int async_hangup(async_sess_t *);
@@ -335 +358 @@
 extern async_exch_t *async_exchange_begin(async_sess_t *);
 extern void async_exchange_end(async_exch_t *);
-
-/*
- * FIXME These functions just work around problems with parallel exchange
- * management. Proper solution needs to be implemented.
- */
-void async_sess_args_set(async_sess_t *sess, sysarg_t, sysarg_t, sysarg_t);
 
 /*
@@ -449 +466 @@
 extern async_sess_t *async_callback_receive_start(exch_mgmt_t, ipc_call_t *);
 
-extern int async_state_change_start(async_exch_t *, sysarg_t, sysarg_t,
-    sysarg_t, async_exch_t *);
-extern bool async_state_change_receive(ipc_callid_t *, sysarg_t *, sysarg_t *,
-    sysarg_t *);
-extern int async_state_change_finalize(ipc_callid_t, async_exch_t *);
-
-extern void *async_remote_state_acquire(async_sess_t *);
-extern void async_remote_state_update(async_sess_t *, void *);
-extern void async_remote_state_release(async_sess_t *);
-extern void async_remote_state_release_exchange(async_exch_t *);
-
 #endif