Index: uspace/lib/libc/generic/async.c =================================================================== --- uspace/lib/libc/generic/async.c (revision 8498915fcb2cf4aa2a0cc399866d4191c963b740) +++ uspace/lib/libc/generic/async.c (revision 0cc43137360df84474b0c4424e7571bdd7031787) @@ -102,4 +102,5 @@ #include #include +#include atomic_t async_futex = FUTEX_INITIALIZER; @@ -176,5 +177,5 @@ * disabled. */ -__thread int in_interrupt_handler; +__thread int _in_interrupt_handler; static void default_client_connection(ipc_callid_t callid, ipc_call_t *call); @@ -190,4 +191,15 @@ */ static async_client_conn_t interrupt_received = default_interrupt_received; + +/* + * Getter for _in_interrupt_handler. We need to export the value of this thread + * local variable to other modules, but the binutils 2.18 linkers die on an + * attempt to export this symbol in the header file. For now, consider this as a + * workaround. + */ +bool in_interrupt_handler(void) +{ + return _in_interrupt_handler; +} #define CONN_HASH_TABLE_CHAINS 32 @@ -518,7 +530,7 @@ /* Unrouted call - do some default behaviour */ if ((callid & IPC_CALLID_NOTIFICATION)) { - in_interrupt_handler = 1; + _in_interrupt_handler = 1; (*interrupt_received)(callid, call); - in_interrupt_handler = 0; + _in_interrupt_handler = 0; return; } @@ -717,4 +729,6 @@ * @param arg1 Service-defined payload argument. * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. + * @param arg4 Service-defined payload argument. * @param dataptr If non-NULL, storage where the reply data will be * stored. @@ -722,10 +736,10 @@ * @return Hash of the sent message. */ -aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipc_call_t *dataptr) +aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr) { amsg_t *msg; - if (in_interrupt_handler) { + if (_in_interrupt_handler) { printf("Cannot send asynchronous request in interrupt " "handler.\n"); @@ -740,5 +754,6 @@ msg->wdata.active = 1; - ipc_call_async_2(phoneid, method, arg1, arg2, msg, reply_received, 1); + ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg, + reply_received, 1); return (aid_t) msg; @@ -755,4 +770,6 @@ * @param arg2 Service-defined payload argument. * @param arg3 Service-defined payload argument. + * @param arg4 Service-defined payload argument. + * @param arg5 Service-defined payload argument. * @param dataptr If non-NULL, storage where the reply data will be * stored. @@ -760,10 +777,11 @@ * @return Hash of the sent message. */ -aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipcarg_t arg3, ipc_call_t *dataptr) +aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, + ipc_call_t *dataptr) { amsg_t *msg; - if (in_interrupt_handler) { + if (_in_interrupt_handler) { printf("Cannot send asynchronous request in interrupt " "handler.\n"); @@ -777,7 +795,7 @@ /* We may sleep in next method, but it will use its own mechanism */ msg->wdata.active = 1; - - ipc_call_async_3(phoneid, method, arg1, arg2, arg3, msg, reply_received, - 1); + + ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg, + reply_received, 1); return (aid_t) msg; @@ -867,5 +885,5 @@ amsg_t *msg; - if (in_interrupt_handler) { + if (_in_interrupt_handler) { printf("Cannot call async_usleep in interrupt handler.\n"); _exit(1); @@ -909,16 +927,86 @@ } -/* Primitive functions for simple communication */ -void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, - ipcarg_t arg2, ipcarg_t arg3) -{ - ipc_call_async_3(phoneid, method, arg1, arg2, arg3, NULL, NULL, - !in_interrupt_handler); -} - -void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2) -{ - ipc_call_async_2(phoneid, method, arg1, arg2, NULL, NULL, - !in_interrupt_handler); +/** Pseudo-synchronous message sending - fast version. + * + * Send message asynchronously and return only after the reply arrives. + * + * This function can only transfer 4 register payload arguments. For + * transferring more arguments, see the slower async_req_slow(). + * + * @param phoneid Hash of the phone through which to make the call. + * @param method Method of the call. + * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. + * @param arg4 Service-defined payload argument. + * @param r1 If non-NULL, storage for the 1st reply argument. + * @param r2 If non-NULL, storage for the 2nd reply argument. + * @param r3 If non-NULL, storage for the 3rd reply argument. + * @param r4 If non-NULL, storage for the 4th reply argument. + * @param r5 If non-NULL, storage for the 5th reply argument. + * @return Return code of the reply or a negative error code. + */ +ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2, + ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5) +{ + ipc_call_t result; + ipcarg_t rc; + + aid_t eid = async_send_4(phoneid, method, arg1, arg2, arg3, arg4, + &result); + async_wait_for(eid, &rc); + if (r1) + *r1 = IPC_GET_ARG1(result); + if (r2) + *r2 = IPC_GET_ARG2(result); + if (r3) + *r3 = IPC_GET_ARG3(result); + if (r4) + *r4 = IPC_GET_ARG4(result); + if (r5) + *r5 = IPC_GET_ARG5(result); + return rc; +} + +/** Pseudo-synchronous message sending - slow version. + * + * Send message asynchronously and return only after the reply arrives. + * + * @param phoneid Hash of the phone through which to make the call. + * @param method Method of the call. + * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. + * @param arg4 Service-defined payload argument. + * @param arg5 Service-defined payload argument. + * @param r1 If non-NULL, storage for the 1st reply argument. + * @param r2 If non-NULL, storage for the 2nd reply argument. + * @param r3 If non-NULL, storage for the 3rd reply argument. + * @param r4 If non-NULL, storage for the 4th reply argument. + * @param r5 If non-NULL, storage for the 5th reply argument. + * @return Return code of the reply or a negative error code. + */ +ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1, + ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5) +{ + ipc_call_t result; + ipcarg_t rc; + + aid_t eid = async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, + &result); + async_wait_for(eid, &rc); + if (r1) + *r1 = IPC_GET_ARG1(result); + if (r2) + *r2 = IPC_GET_ARG2(result); + if (r3) + *r3 = IPC_GET_ARG3(result); + if (r4) + *r4 = IPC_GET_ARG4(result); + if (r5) + *r5 = IPC_GET_ARG5(result); + return rc; } Index: uspace/lib/libc/generic/io/stream.c =================================================================== --- uspace/lib/libc/generic/io/stream.c (revision 8498915fcb2cf4aa2a0cc399866d4191c963b740) +++ uspace/lib/libc/generic/io/stream.c (revision 0cc43137360df84474b0c4424e7571bdd7031787) @@ -71,5 +71,5 @@ while (i < count) { - if (async_req_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, + if (async_req_0_2(streams[0].phone, CONSOLE_GETCHAR, &r0, &r1) < 0) { return -1; @@ -85,5 +85,5 @@ for (i = 0; i < count; i++) - async_msg(streams[1].phone, CONSOLE_PUTCHAR, + async_msg_1(streams[1].phone, CONSOLE_PUTCHAR, ((const char *) buf)[i]); Index: uspace/lib/libc/include/async.h =================================================================== --- uspace/lib/libc/include/async.h (revision 8498915fcb2cf4aa2a0cc399866d4191c963b740) +++ uspace/lib/libc/include/async.h (revision 0cc43137360df84474b0c4424e7571bdd7031787) @@ -40,4 +40,5 @@ #include #include +#include typedef ipc_callid_t aid_t; @@ -55,51 +56,34 @@ } -aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, +/* + * 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 + * 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 phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr); +extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipc_call_t *dataptr); -aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipcarg_t arg3, ipc_call_t *dataptr); -void async_wait_for(aid_t amsgid, ipcarg_t *result); -int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout); - -/** Pseudo-synchronous message sending - * - * Send message through IPC, wait in the event loop, until it is received - * - * @return Return code of message - */ -static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, - ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2) -{ - ipc_call_t result; - ipcarg_t rc; - - aid_t eid = async_send_2(phoneid, method, arg1, arg2, &result); - async_wait_for(eid, &rc); - if (r1) - *r1 = IPC_GET_ARG1(result); - if (r2) - *r2 = IPC_GET_ARG2(result); - return rc; -} -#define async_req(phoneid, method, arg1, r1) \ - async_req_2(phoneid, method, arg1, 0, r1, 0) - -static inline ipcarg_t async_req_3(int phoneid, ipcarg_t method, ipcarg_t arg1, - ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, ipcarg_t *r2, ipcarg_t *r3) -{ - ipc_call_t result; - ipcarg_t rc; - - aid_t eid = async_send_3(phoneid, method, arg1, arg2, arg3, &result); - async_wait_for(eid, &rc); - if (r1) - *r1 = IPC_GET_ARG1(result); - if (r2) - *r2 = IPC_GET_ARG2(result); - if (r3) - *r3 = IPC_GET_ARG3(result); - return rc; -} - +extern void async_wait_for(aid_t amsgid, ipcarg_t *result); +extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, + suseconds_t timeout); fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, @@ -108,14 +92,155 @@ void async_create_manager(void); void async_destroy_manager(void); -void async_set_client_connection(async_client_conn_t conn); -void async_set_interrupt_received(async_client_conn_t conn); int _async_init(void); - -/* Primitve functions for IPC communication */ -void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipcarg_t arg3); -void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2); -#define async_msg(ph, m, a1) async_msg_2(ph, m, a1, 0) +extern void async_set_client_connection(async_client_conn_t conn); +extern void async_set_interrupt_received(async_client_conn_t conn); + +/* Wrappers for simple communication */ +#define async_msg_0(phone, method) \ + ipc_call_async_0((phone), (method), NULL, NULL, !in_interrupt_handler()) +#define async_msg_1(phone, method, arg1) \ + ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \ + !in_interrupt_handler()) +#define async_msg_2(phone, method, arg1, arg2) \ + ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \ + !in_interrupt_handler()) +#define async_msg_3(phone, method, arg1, arg2, arg3) \ + ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \ + !in_interrupt_handler()) +#define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \ + ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ + NULL, !in_interrupt_handler()) +#define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \ + ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), NULL, NULL, !in_interrupt_handler()) + +/* + * User-friendly wrappers for async_req_fast() and async_req_slow(). The macros + * are in the form async_req_m_n(), where m is the number of payload arguments + * and n is the number of return arguments. The macros decidce between the fast + * and slow verion based on m. + */ +#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, \ + NULL, NULL, NULL) +#define async_req_2_1(phoneid, method, arg1, arg2, rc1) \ + async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (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), \ + 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, \ + 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, \ + 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, \ + rc3, rc4, rc5) \ + async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), (rc2), (rc3), (rc4), (rc5)) + +extern ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2, + ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5); +extern ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1, + ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5); static inline void async_serialize_start(void) @@ -129,5 +254,8 @@ } +extern bool in_interrupt_handler(void); + extern atomic_t async_futex; + #endif