Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision b77ce846fff6014d76b815421e18b3d5a97d502d) +++ uspace/lib/c/include/async.h (revision 2af29ed7c9c717445d7e7c17955fdb597d7ce3c8) @@ -41,6 +41,6 @@ #include -#include #include +#include #include #include @@ -55,4 +55,76 @@ typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *); +/** Exchange management style + * + */ +typedef enum { + /** No explicit exchange management + * + * Suitable for protocols which use a single + * IPC message per exchange only. + * + */ + EXCHANGE_ATOMIC = 0, + + /** Exchange management via phone cloning + * + * Suitable for servers which support client + * data tracking by task hashes and do not + * mind cloned phones. + * + */ + EXCHANGE_PARALLEL, + + /** Exchange management via mutual exclusion + * + * Suitable for any kind of client/server communication, + * but can limit parallelism. + * + */ + EXCHANGE_SERIALIZE +} exch_mgmt_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; @@ -68,32 +140,32 @@ * User-friendly wrappers for async_send_fast() and async_send_slow(). The * macros are in the form async_send_m(), where m denotes the number of payload - * arguments. Each macros chooses between the fast and the slow version based + * arguments. Each macros chooses between the fast and the slow version based * on m. */ -#define async_send_0(phoneid, method, dataptr) \ - async_send_fast((phoneid), (method), 0, 0, 0, 0, (dataptr)) -#define async_send_1(phoneid, method, arg1, dataptr) \ - async_send_fast((phoneid), (method), (arg1), 0, 0, 0, (dataptr)) -#define async_send_2(phoneid, method, arg1, arg2, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), 0, 0, (dataptr)) -#define async_send_3(phoneid, method, arg1, arg2, arg3, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (dataptr)) -#define async_send_4(phoneid, method, arg1, arg2, arg3, arg4, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (dataptr)) -#define async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \ - async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (dataptr)) - -extern aid_t async_send_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, ipc_call_t *); -extern aid_t async_send_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, +#define async_send_0(exch, method, dataptr) \ + async_send_fast(exch, method, 0, 0, 0, 0, dataptr) +#define async_send_1(exch, method, arg1, dataptr) \ + async_send_fast(exch, method, arg1, 0, 0, 0, dataptr) +#define async_send_2(exch, method, arg1, arg2, dataptr) \ + async_send_fast(exch, method, arg1, arg2, 0, 0, dataptr) +#define async_send_3(exch, method, arg1, arg2, arg3, dataptr) \ + async_send_fast(exch, method, arg1, arg2, arg3, 0, dataptr) +#define async_send_4(exch, method, arg1, arg2, arg3, arg4, dataptr) \ + async_send_fast(exch, method, arg1, arg2, arg3, arg4, dataptr) +#define async_send_5(exch, method, arg1, arg2, arg3, arg4, arg5, dataptr) \ + async_send_slow(exch, method, arg1, arg2, arg3, arg4, arg5, dataptr) + +extern aid_t async_send_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); +extern aid_t async_send_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); + extern void async_wait_for(aid_t, sysarg_t *); extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t); extern fid_t async_new_connection(sysarg_t, sysarg_t, ipc_callid_t, - ipc_call_t *, void (*)(ipc_callid_t, ipc_call_t *)); + ipc_call_t *, async_client_conn_t); + extern void async_usleep(suseconds_t); extern void async_create_manager(void); @@ -102,6 +174,5 @@ extern void async_set_client_data_constructor(async_client_data_ctor_t); extern void async_set_client_data_destructor(async_client_data_dtor_t); - -extern void *async_client_data_get(void); +extern void *async_get_client_data(void); extern void async_set_client_connection(async_client_conn_t); @@ -112,11 +183,12 @@ */ -extern void async_msg_0(int, sysarg_t); -extern void async_msg_1(int, sysarg_t, sysarg_t); -extern void async_msg_2(int, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_3(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_4(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_5(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, +extern void async_msg_0(async_exch_t *, sysarg_t); +extern void async_msg_1(async_exch_t *, sysarg_t, sysarg_t); +extern void async_msg_2(async_exch_t *, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_3(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_4(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_5(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t); /* @@ -138,8 +210,8 @@ */ -extern int async_forward_fast(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t, - unsigned int); -extern int async_forward_slow(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, sysarg_t, unsigned int); +extern int async_forward_fast(ipc_callid_t, async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, unsigned int); +extern int async_forward_slow(ipc_callid_t, async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int); /* @@ -150,161 +222,160 @@ */ -#define async_req_0_0(phoneid, method) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \ - NULL) -#define async_req_0_1(phoneid, method, r1) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), NULL, NULL, NULL, \ - NULL) -#define async_req_0_2(phoneid, method, r1, r2) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), NULL, NULL, \ - NULL) -#define async_req_0_3(phoneid, method, r1, r2, r3) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), NULL, \ - NULL) -#define async_req_0_4(phoneid, method, r1, r2, r3, r4) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ - NULL) -#define async_req_0_5(phoneid, method, r1, r2, r3, r4, r5) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ - (r5)) -#define async_req_1_0(phoneid, method, arg1) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, NULL, NULL, NULL, \ - NULL, NULL) -#define async_req_1_1(phoneid, method, arg1, rc1) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), NULL, NULL, \ - NULL, NULL) -#define async_req_1_2(phoneid, method, arg1, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), NULL, \ - NULL, NULL) -#define async_req_1_3(phoneid, method, arg1, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - NULL, NULL) -#define async_req_1_4(phoneid, method, arg1, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - (rc4), NULL) -#define async_req_1_5(phoneid, method, arg1, rc1, rc2, rc3, rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - (rc4), (rc5)) -#define async_req_2_0(phoneid, method, arg1, arg2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL, NULL, \ +#define async_req_0_0(exch, method) \ + async_req_fast(exch, method, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) +#define async_req_0_1(exch, method, r1) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, NULL, NULL, NULL, NULL) +#define async_req_0_2(exch, method, r1, r2) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, NULL, NULL, NULL) +#define async_req_0_3(exch, method, r1, r2, r3) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, NULL, NULL) +#define async_req_0_4(exch, method, r1, r2, r3, r4) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, r4, NULL) +#define async_req_0_5(exch, method, r1, r2, r3, r4, r5) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, r4, r5) + +#define async_req_1_0(exch, method, arg1) \ + async_req_fast(exch, method, arg1, 0, 0, 0, NULL, NULL, NULL, NULL, \ + NULL) +#define async_req_1_1(exch, method, arg1, rc1) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, NULL, NULL, NULL, \ + NULL) +#define async_req_1_2(exch, method, arg1, rc1, rc2) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, NULL, NULL, \ + NULL) +#define async_req_1_3(exch, method, arg1, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, NULL, \ + NULL) +#define async_req_1_4(exch, method, arg1, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, rc4, \ + NULL) +#define async_req_1_5(exch, method, arg1, rc1, rc2, rc3, rc4, rc5) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, rc4, \ + rc5) + +#define async_req_2_0(exch, method, arg1, arg2) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, NULL, NULL, NULL, \ + NULL, NULL) +#define async_req_2_1(exch, method, arg1, arg2, rc1) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, NULL, NULL, \ + NULL, NULL) +#define async_req_2_2(exch, method, arg1, arg2, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, NULL, NULL, \ + NULL) +#define async_req_2_3(exch, method, arg1, arg2, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, NULL, \ + NULL) +#define async_req_2_4(exch, method, arg1, arg2, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, rc4, \ + NULL) +#define async_req_2_5(exch, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, rc4, \ + rc5) + +#define async_req_3_0(exch, method, arg1, arg2, arg3) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, NULL, NULL, NULL, \ + NULL, NULL) +#define async_req_3_1(exch, method, arg1, arg2, arg3, rc1) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, NULL, NULL, \ + NULL, NULL) +#define async_req_3_2(exch, method, arg1, arg2, arg3, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, NULL, \ + NULL, NULL) +#define async_req_3_3(exch, method, arg1, arg2, arg3, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + NULL, NULL) +#define async_req_3_4(exch, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + rc4, NULL) +#define async_req_3_5(exch, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \ + rc5) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + rc4, rc5) + +#define async_req_4_0(exch, method, arg1, arg2, arg3, arg4) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, NULL, NULL, \ NULL, NULL, NULL) -#define async_req_2_1(phoneid, method, arg1, arg2, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), NULL, \ +#define async_req_4_1(exch, method, arg1, arg2, arg3, arg4, rc1) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, NULL, \ NULL, NULL, NULL) -#define async_req_2_2(phoneid, method, arg1, arg2, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ +#define async_req_4_2(exch, method, arg1, arg2, arg3, arg4, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, NULL, \ + NULL, NULL) +#define async_req_4_3(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + NULL, NULL) +#define async_req_4_4(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, NULL) +#define async_req_4_5(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, rc5) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, rc5) + +#define async_req_5_0(exch, method, arg1, arg2, arg3, arg4, arg5) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, NULL, \ + NULL, NULL, NULL, NULL) +#define async_req_5_1(exch, method, arg1, arg2, arg3, arg4, arg5, rc1) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, \ + NULL, NULL, NULL, NULL) +#define async_req_5_2(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ NULL, NULL, NULL) -#define async_req_2_3(phoneid, method, arg1, arg2, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), NULL, NULL) -#define async_req_2_4(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), (rc4), NULL) -#define async_req_2_5(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), (rc4), (rc5)) -#define async_req_3_0(phoneid, method, arg1, arg2, arg3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, NULL, NULL, \ - NULL, NULL, NULL) -#define async_req_3_1(phoneid, method, arg1, arg2, arg3, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - NULL, NULL, NULL, NULL) -#define async_req_3_2(phoneid, method, arg1, arg2, arg3, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), NULL, NULL, NULL) -#define async_req_3_3(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), NULL, NULL) -#define async_req_3_4(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), (rc4), NULL) -#define async_req_3_5(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \ - rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), (rc4), (rc5)) -#define async_req_4_0(phoneid, method, arg1, arg2, arg3, arg4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ - NULL, NULL, NULL, NULL) -#define async_req_4_1(phoneid, method, arg1, arg2, arg3, arg4, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - NULL, NULL, NULL, NULL) -#define async_req_4_2(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - (rc2), NULL, NULL, NULL) -#define async_req_4_3(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - (rc2), (rc3), NULL, NULL) -#define async_req_4_4(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ - rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (rc1), (rc2), (rc3), (rc4), NULL) -#define async_req_4_5(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ - rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (rc1), (rc2), (rc3), (rc4), (rc5)) -#define async_req_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), NULL, NULL, NULL, NULL, NULL) -#define async_req_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), NULL, NULL, NULL, NULL) -#define async_req_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), NULL, NULL, NULL) -#define async_req_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ +#define async_req_5_3(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), NULL, NULL) -#define async_req_5_4(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, NULL, NULL) +#define async_req_5_4(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3, rc4) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), (rc4), NULL) -#define async_req_5_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4, NULL) +#define async_req_5_5(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3, rc4, rc5) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), (rc4), (rc5)) - -extern sysarg_t async_req_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); -extern sysarg_t async_req_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4, rc5) + +extern sysarg_t async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); - -static inline void async_serialize_start(void) -{ - fibril_inc_sercount(); -} - -static inline void async_serialize_end(void) -{ - fibril_dec_sercount(); -} - -extern int async_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, +extern sysarg_t async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, + sysarg_t *, sysarg_t *); + +extern async_sess_t *async_connect_me(exch_mgmt_t, async_exch_t *); +extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t, + sysarg_t, sysarg_t); +extern async_sess_t *async_connect_me_to_blocking(exch_mgmt_t, async_exch_t *, + sysarg_t, sysarg_t, sysarg_t); +extern async_sess_t *async_connect_kbox(task_id_t); + +extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, async_client_conn_t); -extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t); -extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t); -extern int async_connect_kbox(task_id_t); -extern int async_hangup(int); + +extern int async_hangup(async_sess_t *); extern void async_poke(void); +extern async_exch_t *async_exchange_begin(async_sess_t *); +extern void async_exchange_end(async_exch_t *); + /* * User-friendly wrappers for async_share_in_start(). */ -#define async_share_in_start_0_0(phoneid, dst, size) \ - async_share_in_start((phoneid), (dst), (size), 0, NULL) -#define async_share_in_start_0_1(phoneid, dst, size, flags) \ - async_share_in_start((phoneid), (dst), (size), 0, (flags)) -#define async_share_in_start_1_0(phoneid, dst, size, arg) \ - async_share_in_start((phoneid), (dst), (size), (arg), NULL) -#define async_share_in_start_1_1(phoneid, dst, size, arg, flags) \ - async_share_in_start((phoneid), (dst), (size), (arg), (flags)) - -extern int async_share_in_start(int, void *, size_t, sysarg_t, unsigned int *); +#define async_share_in_start_0_0(exch, dst, size) \ + async_share_in_start(exch, dst, size, 0, NULL) +#define async_share_in_start_0_1(exch, dst, size, flags) \ + async_share_in_start(exch, dst, size, 0, flags) +#define async_share_in_start_1_0(exch, dst, size, arg) \ + async_share_in_start(exch, dst, size, arg, NULL) +#define async_share_in_start_1_1(exch, dst, size, arg, flags) \ + async_share_in_start(exch, dst, size, arg, flags) + +extern int async_share_in_start(async_exch_t *, void *, size_t, sysarg_t, + unsigned int *); extern bool async_share_in_receive(ipc_callid_t *, size_t *); extern int async_share_in_finalize(ipc_callid_t, void *, unsigned int); -extern int async_share_out_start(int, void *, unsigned int); +extern int async_share_out_start(async_exch_t *, void *, unsigned int); extern bool async_share_out_receive(ipc_callid_t *, size_t *, unsigned int *); extern int async_share_out_finalize(ipc_callid_t, void *); @@ -314,40 +385,37 @@ */ -#define async_data_read_forward_0_0(phoneid, method, answer) \ - async_data_read_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL) -#define async_data_read_forward_0_1(phoneid, method, answer) \ - async_data_read_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer)) -#define async_data_read_forward_1_0(phoneid, method, arg1, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL) -#define async_data_read_forward_1_1(phoneid, method, arg1, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), 0, 0, 0, (answer)) -#define async_data_read_forward_2_0(phoneid, method, arg1, arg2, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL) -#define async_data_read_forward_2_1(phoneid, method, arg1, arg2, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - (answer)) -#define async_data_read_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \ - NULL) -#define async_data_read_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \ - (answer)) -#define async_data_read_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), NULL) -#define async_data_read_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), (answer)) - -extern aid_t async_data_read(int, void *, size_t, ipc_call_t *); -#define async_data_read_start(p, buf, len) \ - async_data_read_start_generic((p), (buf), (len), IPC_XF_NONE) - -extern int async_data_read_start_generic(int, void *, size_t, int); +#define async_data_read_forward_0_0(exch, method, answer) \ + async_data_read_forward_fast(exch, method, 0, 0, 0, 0, NULL) +#define async_data_read_forward_0_1(exch, method, answer) \ + async_data_read_forward_fast(exch, method, 0, 0, 0, 0, answer) +#define async_data_read_forward_1_0(exch, method, arg1, answer) \ + async_data_read_forward_fast(exch, method, arg1, 0, 0, 0, NULL) +#define async_data_read_forward_1_1(exch, method, arg1, answer) \ + async_data_read_forward_fast(exch, method, arg1, 0, 0, 0, answer) +#define async_data_read_forward_2_0(exch, method, arg1, arg2, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, 0, 0, NULL) +#define async_data_read_forward_2_1(exch, method, arg1, arg2, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, 0, 0, answer) +#define async_data_read_forward_3_0(exch, method, arg1, arg2, arg3, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, 0, NULL) +#define async_data_read_forward_3_1(exch, method, arg1, arg2, arg3, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + answer) +#define async_data_read_forward_4_0(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + NULL) +#define async_data_read_forward_4_1(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + answer) + +extern aid_t async_data_read(async_exch_t *, void *, size_t, ipc_call_t *); +extern int async_data_read_start(async_exch_t *, void *, size_t); extern bool async_data_read_receive(ipc_callid_t *, size_t *); extern int async_data_read_finalize(ipc_callid_t, const void *, size_t); -extern int async_data_read_forward_fast(int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, ipc_call_t *); +extern int async_data_read_forward_fast(async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); /* @@ -355,36 +423,32 @@ */ -#define async_data_write_forward_0_0(phoneid, method, answer) \ - async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL) -#define async_data_write_forward_0_1(phoneid, method, answer) \ - async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer)) -#define async_data_write_forward_1_0(phoneid, method, arg1, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL) -#define async_data_write_forward_1_1(phoneid, method, arg1, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, \ - (answer)) -#define async_data_write_forward_2_0(phoneid, method, arg1, arg2, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - NULL) -#define async_data_write_forward_2_1(phoneid, method, arg1, arg2, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - (answer)) -#define async_data_write_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - 0, NULL) -#define async_data_write_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - 0, (answer)) -#define async_data_write_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), NULL) -#define async_data_write_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), (answer)) - -#define async_data_write_start(p, buf, len) \ - async_data_write_start_generic((p), (buf), (len), IPC_XF_NONE) - -extern int async_data_write_start_generic(int, const void *, size_t, int); +#define async_data_write_forward_0_0(exch, method, answer) \ + async_data_write_forward_fast(exch, method, 0, 0, 0, 0, NULL) +#define async_data_write_forward_0_1(exch, method, answer) \ + async_data_write_forward_fast(exch, method, 0, 0, 0, 0, answer) +#define async_data_write_forward_1_0(exch, method, arg1, answer) \ + async_data_write_forward_fast(exch, method, arg1, 0, 0, 0, NULL) +#define async_data_write_forward_1_1(exch, method, arg1, answer) \ + async_data_write_forward_fast(exch, method, arg1, 0, 0, 0, answer) +#define async_data_write_forward_2_0(exch, method, arg1, arg2, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, 0, 0, NULL) +#define async_data_write_forward_2_1(exch, method, arg1, arg2, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, 0, 0, answer) +#define async_data_write_forward_3_0(exch, method, arg1, arg2, arg3, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + NULL) +#define async_data_write_forward_3_1(exch, method, arg1, arg2, arg3, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + answer) +#define async_data_write_forward_4_0(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + NULL) +#define async_data_write_forward_4_1(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + answer) + +extern int async_data_write_start(async_exch_t *, const void *, size_t); extern bool async_data_write_receive(ipc_callid_t *, size_t *); extern int async_data_write_finalize(ipc_callid_t, void *, size_t); @@ -394,6 +458,10 @@ extern void async_data_write_void(sysarg_t); -extern int async_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, ipc_call_t *); +extern int async_data_write_forward_fast(async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); + +extern int async_exchange_clone(async_exch_t *, async_exch_t *); +extern async_sess_t *async_clone_receive(exch_mgmt_t); +extern async_sess_t *async_callback_receive(exch_mgmt_t); #endif