Index: uspace/lib/c/generic/async/client.c =================================================================== --- uspace/lib/c/generic/async/client.c (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/generic/async/client.c (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -241,12 +241,13 @@ * */ -static void reply_received(void *arg, errno_t retval, ipc_call_t *data) -{ - assert(arg); +void async_reply_received(ipc_call_t *data) +{ + amsg_t *msg = data->label; + if (!msg) + return; futex_lock(&async_futex); - amsg_t *msg = (amsg_t *) arg; - msg->retval = retval; + msg->retval = IPC_GET_RETVAL(*data); /* Copy data after futex_down, just in case the call was detached */ @@ -302,6 +303,10 @@ msg->wdata.active = true; - ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, msg, - reply_received); + errno_t rc = ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, + arg4, msg); + if (rc != EOK) { + msg->retval = rc; + msg->done = true; + } return (aid_t) msg; @@ -340,6 +345,10 @@ msg->wdata.active = true; - ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, arg5, - msg, reply_received); + errno_t rc = ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, + arg4, arg5, msg); + if (rc != EOK) { + msg->retval = rc; + msg->done = true; + } return (aid_t) msg; @@ -653,5 +662,5 @@ { if (exch != NULL) - ipc_call_async_0(exch->phone, imethod, NULL, NULL); + ipc_call_async_0(exch->phone, imethod, NULL); } @@ -659,5 +668,5 @@ { if (exch != NULL) - ipc_call_async_1(exch->phone, imethod, arg1, NULL, NULL); + ipc_call_async_1(exch->phone, imethod, arg1, NULL); } @@ -666,5 +675,5 @@ { if (exch != NULL) - ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL, NULL); + ipc_call_async_2(exch->phone, imethod, arg1, arg2, NULL); } @@ -673,6 +682,5 @@ { if (exch != NULL) - ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL, - NULL); + ipc_call_async_3(exch->phone, imethod, arg1, arg2, arg3, NULL); } @@ -682,5 +690,5 @@ if (exch != NULL) ipc_call_async_4(exch->phone, imethod, arg1, arg2, arg3, arg4, - NULL, NULL); + NULL); } @@ -690,5 +698,5 @@ if (exch != NULL) ipc_call_async_5(exch->phone, imethod, arg1, arg2, arg3, arg4, - arg5, NULL, NULL); + arg5, NULL); } @@ -710,8 +718,11 @@ msg->wdata.active = true; - ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, (sysarg_t) iface, arg2, - arg3, flags, msg, reply_received); - - errno_t rc; + errno_t rc = ipc_call_async_4(phone, IPC_M_CONNECT_ME_TO, + (sysarg_t) iface, arg2, arg3, flags, msg); + if (rc != EOK) { + msg->retval = rc; + msg->done = true; + } + async_wait_for((aid_t) msg, &rc); Index: uspace/lib/c/generic/async/server.c =================================================================== --- uspace/lib/c/generic/async/server.c (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/generic/async/server.c (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -1088,6 +1088,9 @@ assert(call); - if (call->flags & IPC_CALL_ANSWERED) + if (call->flags & IPC_CALL_ANSWERED) { + /* Answer to a call made by us. */ + async_reply_received(call); return; + } if (call->cap_handle == CAP_NIL) { @@ -1195,5 +1198,5 @@ ipc_call_t call; - errno_t rc = ipc_wait_cycle(&call, next_timeout, flags); + errno_t rc = ipc_wait(&call, next_timeout, flags); atomic_dec(&threads_in_ipc_wait); Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/generic/ipc.c (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -50,64 +50,4 @@ #include -/** - * Structures of this type are used for keeping track of sent asynchronous calls. - */ -typedef struct async_call { - ipc_async_callback_t callback; - void *private; - - struct { - ipc_call_t data; - } msg; -} async_call_t; - -/** Prologue for ipc_call_async_*() functions. - * - * @param private Argument for the answer/error callback. - * @param callback Answer/error callback. - * - * @return New, partially initialized async_call structure or NULL. - * - */ -static inline async_call_t *ipc_prepare_async(void *private, - ipc_async_callback_t callback) -{ - async_call_t *call = - (async_call_t *) malloc(sizeof(async_call_t)); - if (!call) { - if (callback) - callback(private, ENOMEM, NULL); - - return NULL; - } - - call->callback = callback; - call->private = private; - - return call; -} - -/** Epilogue for ipc_call_async_*() functions. - * - * @param rc Value returned by the SYS_IPC_CALL_ASYNC_* syscall. - * @param call Structure returned by ipc_prepare_async(). - */ -static inline void ipc_finish_async(errno_t rc, async_call_t *call) -{ - if (!call) { - /* Nothing to do regardless if failed or not */ - return; - } - - if (rc != EOK) { - /* Call asynchronous handler with error code */ - if (call->callback) - call->callback(call->private, ENOENT, NULL); - - free(call); - return; - } -} - /** Fast asynchronous call. * @@ -126,20 +66,12 @@ * @param arg2 Service-defined payload argument. * @param arg3 Service-defined payload argument. - * @param private Argument to be passed to the answer/error callback. - * @param callback Answer or error callback. - */ -void ipc_call_async_fast(cap_phone_handle_t phandle, sysarg_t imethod, - sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, void *private, - ipc_async_callback_t callback) -{ - async_call_t *call = ipc_prepare_async(private, callback); - if (!call) - return; - - errno_t rc = (errno_t) __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, + * @param label A value to set to the label field of the answer. + */ +errno_t ipc_call_async_fast(cap_phone_handle_t phandle, sysarg_t imethod, + sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, void *label) +{ + return __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, CAP_HANDLE_RAW(phandle), imethod, arg1, arg2, arg3, - (sysarg_t) call); - - ipc_finish_async(rc, call); + (sysarg_t) label); } @@ -159,27 +91,22 @@ * @param arg4 Service-defined payload argument. * @param arg5 Service-defined payload argument. - * @param private Argument to be passed to the answer/error callback. - * @param callback Answer or error callback. - */ -void ipc_call_async_slow(cap_phone_handle_t phandle, sysarg_t imethod, + * @param label A value to set to the label field of the answer. + */ +errno_t ipc_call_async_slow(cap_phone_handle_t phandle, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, - void *private, ipc_async_callback_t callback) -{ - async_call_t *call = ipc_prepare_async(private, callback); - if (!call) - return; - - IPC_SET_IMETHOD(call->msg.data, imethod); - IPC_SET_ARG1(call->msg.data, arg1); - IPC_SET_ARG2(call->msg.data, arg2); - IPC_SET_ARG3(call->msg.data, arg3); - IPC_SET_ARG4(call->msg.data, arg4); - IPC_SET_ARG5(call->msg.data, arg5); - - errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW, - CAP_HANDLE_RAW(phandle), (sysarg_t) &call->msg.data, - (sysarg_t) call); - - ipc_finish_async(rc, call); + void *label) +{ + ipc_call_t data; + + IPC_SET_IMETHOD(data, imethod); + IPC_SET_ARG1(data, arg1); + IPC_SET_ARG2(data, arg2); + IPC_SET_ARG3(data, arg3); + IPC_SET_ARG4(data, arg4); + IPC_SET_ARG5(data, arg5); + + return __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW, + CAP_HANDLE_RAW(phandle), (sysarg_t) &data, + (sysarg_t) label); } @@ -237,42 +164,4 @@ } -/** Handle received answer. - * - * @param data Call data of the answer. - */ -static void handle_answer(ipc_call_t *data) -{ - async_call_t *call = data->label; - - if (!call) - return; - - if (call->callback) - call->callback(call->private, IPC_GET_RETVAL(*data), data); - free(call); -} - -/** Wait for first IPC call to come. - * - * @param[out] call Storage for the received call. - * @param[in] usec Timeout in microseconds - * @param[in[ flags Flags passed to SYS_IPC_WAIT (blocking, nonblocking). - * - * @return Error code. - */ -errno_t ipc_wait_cycle(ipc_call_t *call, sysarg_t usec, unsigned int flags) -{ - errno_t rc = (errno_t) __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, - flags); - - /* Handle received answers */ - if ((rc == EOK) && (call->cap_handle == CAP_NIL) && - (call->flags & IPC_CALL_ANSWERED)) { - handle_answer(call); - } - - return rc; -} - /** Interrupt one thread of this task from waiting for IPC. * @@ -283,46 +172,8 @@ } -/** Wait for first IPC call to come. - * - * Only requests are returned, answers are processed internally. - * - * @param call Incoming call storage. - * @param usec Timeout in microseconds - * - * @return Error code. - * - */ -errno_t ipc_wait_for_call_timeout(ipc_call_t *call, sysarg_t usec) -{ - errno_t rc; - - do { - rc = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE); - } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && - (call->flags & IPC_CALL_ANSWERED)); - - return rc; -} - -/** Check if there is an IPC call waiting to be picked up. - * - * Only requests are returned, answers are processed internally. - * - * @param call Incoming call storage. - * - * @return Error code. - * - */ -errno_t ipc_trywait_for_call(ipc_call_t *call) -{ - errno_t rc; - - do { - rc = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, - SYNCH_FLAGS_NON_BLOCKING); - } while ((rc == EOK) && (call->cap_handle == CAP_NIL) && - (call->flags & IPC_CALL_ANSWERED)); - - return rc; +errno_t ipc_wait(ipc_call_t *call, sysarg_t usec, unsigned int flags) +{ + // TODO: Use expiration time instead of timeout. + return __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags); } Index: uspace/lib/c/generic/private/async.h =================================================================== --- uspace/lib/c/generic/private/async.h (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/generic/private/async.h (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -143,4 +143,6 @@ extern async_port_handler_t async_get_port_handler(iface_t, port_id_t, void **); +extern void async_reply_received(ipc_call_t *); + #endif Index: uspace/lib/c/include/ipc/common.h =================================================================== --- uspace/lib/c/include/ipc/common.h (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/include/ipc/common.h (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -44,6 +44,4 @@ #define IPC_FLAG_BLOCKING 0x01 -struct async_call; - typedef struct { sysarg_t args[IPC_CALL_LEN]; @@ -51,5 +49,5 @@ sysarg_t in_phone_hash; unsigned int flags; - struct async_call *label; + void *label; cap_call_handle_t cap_handle; } ipc_call_t; Index: uspace/lib/c/include/ipc/ipc.h =================================================================== --- uspace/lib/c/include/ipc/ipc.h (revision 87337dc52aa5f13830c6e760d834e32ad660f9e8) +++ uspace/lib/c/include/ipc/ipc.h (revision d054ad327ffe0b12fea2dcc17f0711048959b7b2) @@ -46,14 +46,6 @@ #include -typedef void (*ipc_async_callback_t)(void *, errno_t, ipc_call_t *); - -extern errno_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int); +extern errno_t ipc_wait(ipc_call_t *, sysarg_t, unsigned int); extern void ipc_poke(void); - -#define ipc_wait_for_call(data) \ - ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT); - -extern errno_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t); -extern errno_t ipc_trywait_for_call(ipc_call_t *); /* @@ -90,28 +82,25 @@ */ -#define ipc_call_async_0(phandle, method, private, callback) \ - ipc_call_async_fast((phandle), (method), 0, 0, 0, (private), (callback)) -#define ipc_call_async_1(phandle, method, arg1, private, callback) \ - ipc_call_async_fast((phandle), (method), (arg1), 0, 0, (private), \ - (callback)) -#define ipc_call_async_2(phandle, method, arg1, arg2, private, callback) \ - ipc_call_async_fast((phandle), (method), (arg1), (arg2), 0, \ - (private), (callback)) -#define ipc_call_async_3(phandle, method, arg1, arg2, arg3, private, callback) \ +#define ipc_call_async_0(phandle, method, label) \ + ipc_call_async_fast((phandle), (method), 0, 0, 0, (label)) +#define ipc_call_async_1(phandle, method, arg1, label) \ + ipc_call_async_fast((phandle), (method), (arg1), 0, 0, (label)) +#define ipc_call_async_2(phandle, method, arg1, arg2, label) \ + ipc_call_async_fast((phandle), (method), (arg1), (arg2), 0, (label)) +#define ipc_call_async_3(phandle, method, arg1, arg2, arg3, label) \ ipc_call_async_fast((phandle), (method), (arg1), (arg2), (arg3), \ - (private), (callback)) -#define ipc_call_async_4(phandle, method, arg1, arg2, arg3, arg4, private, \ - callback) \ + (label)) +#define ipc_call_async_4(phandle, method, arg1, arg2, arg3, arg4, label) \ ipc_call_async_slow((phandle), (method), (arg1), (arg2), (arg3), \ - (arg4), 0, (private), (callback)) + (arg4), 0, (label)) #define ipc_call_async_5(phandle, method, arg1, arg2, arg3, arg4, arg5, \ - private, callback) \ + label) \ ipc_call_async_slow((phandle), (method), (arg1), (arg2), (arg3), \ - (arg4), (arg5), (private), (callback)) + (arg4), (arg5), (label)) -extern void ipc_call_async_fast(cap_phone_handle_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, void *, ipc_async_callback_t); -extern void ipc_call_async_slow(cap_phone_handle_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, sysarg_t, sysarg_t, void *, ipc_async_callback_t); +extern errno_t ipc_call_async_fast(cap_phone_handle_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, void *); +extern errno_t ipc_call_async_slow(cap_phone_handle_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, sysarg_t, void *); extern errno_t ipc_hangup(cap_phone_handle_t);