Index: uspace/lib/libc/generic/async.c =================================================================== --- uspace/lib/libc/generic/async.c (revision e77994dd536e7f1760df4ee55468b443167ed601) +++ uspace/lib/libc/generic/async.c (revision 9db9b10d117f0270316d82b7abfc8c4114e2b00d) @@ -179,4 +179,5 @@ static void default_client_connection(ipc_callid_t callid, ipc_call_t *call); static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call); +static void default_pending(void); /** @@ -191,8 +192,12 @@ static async_client_conn_t interrupt_received = default_interrupt_received; +/** + * Pointer to a fibril function that will be used to handle pending + * operations. + */ +static async_pending_t pending = default_pending; static hash_table_t conn_hash_table; static LIST_INITIALIZE(timeout_list); - #define CONN_HASH_TABLE_CHAINS 32 @@ -371,4 +376,40 @@ fid_t fid = fibril_create(notification_fibril, msg); + fibril_add_ready(fid); + + futex_up(&async_futex); + return true; +} + +/** Pending fibril. + * + * After each call the pending operations are executed in a separate + * fibril. The function pending() is c. + * + * @param arg Unused. + * + * @return Always zero. + * + */ +static int pending_fibril(void *arg) +{ + pending(); + + return 0; +} + +/** Process pending actions. + * + * A new fibril is created which would process the pending operations. + * + * @return False if an error occured. + * True if the execution was passed to the pending fibril. + * + */ +static bool process_pending(void) +{ + futex_down(&async_futex); + + fid_t fid = fibril_create(pending_fibril, NULL); fibril_add_ready(fid); @@ -473,4 +514,13 @@ } +/** Default fibril function that gets called to handle pending operations. + * + * This function is defined as a weak symbol - to be redefined in user code. + * + */ +static void default_pending(void) +{ +} + /** Wrapper for client connection fibril. * @@ -564,5 +614,5 @@ /* Add connection to the connection hash table */ - ipcarg_t key = conn->in_phone_hash; + unsigned long key = conn->in_phone_hash; futex_down(&async_futex); @@ -589,5 +639,5 @@ if ((callid & IPC_CALLID_NOTIFICATION)) { process_notification(callid, call); - return; + goto out; } @@ -598,13 +648,17 @@ async_new_connection(IPC_GET_ARG5(*call), callid, call, client_connection); - return; + goto out; } /* Try to route the call through the connection hash table */ if (route_call(callid, call)) - return; + goto out; /* Unknown call from unknown phone - hang it up */ ipc_answer_0(callid, EHANGUP); + return; + +out: + process_pending(); } @@ -760,11 +814,11 @@ static void reply_received(void *arg, int retval, ipc_call_t *data) { + futex_down(&async_futex); + amsg_t *msg = (amsg_t *) arg; msg->retval = retval; - futex_down(&async_futex); - /* Copy data after futex_down, just in case the call was detached */ - if (msg->dataptr) + if ((msg->dataptr) && (data)) *msg->dataptr = *data; @@ -993,4 +1047,14 @@ { interrupt_received = intr; +} + +/** Setter for pending function pointer. + * + * @param pend Function that will implement a new pending + * operations fibril. + */ +void async_set_pending(async_pending_t pend) +{ + pending = pend; } Index: uspace/lib/libc/include/async.h =================================================================== --- uspace/lib/libc/include/async.h (revision e77994dd536e7f1760df4ee55468b443167ed601) +++ uspace/lib/libc/include/async.h (revision 9db9b10d117f0270316d82b7abfc8c4114e2b00d) @@ -44,4 +44,7 @@ typedef ipc_callid_t aid_t; typedef void (*async_client_conn_t)(ipc_callid_t callid, ipc_call_t *call); +typedef void (*async_pending_t)(void); + +extern atomic_t async_futex; static inline void async_manager(void) @@ -50,5 +53,6 @@ } -ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs); +extern ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs); + static inline ipc_callid_t async_get_call(ipc_call_t *data) { @@ -64,17 +68,17 @@ #define async_send_0(phoneid, method, dataptr) \ - async_send_fast((phoneid), (method), 0, 0, 0, 0, (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)) + 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)) + 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)) + 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)) + 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)) + 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, @@ -87,32 +91,33 @@ suseconds_t timeout); -fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid, +extern fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid, ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *)); -void async_usleep(suseconds_t timeout); -void async_create_manager(void); -void async_destroy_manager(void); -int _async_init(void); +extern void async_usleep(suseconds_t timeout); +extern void async_create_manager(void); +extern void async_destroy_manager(void); +extern int _async_init(void); extern void async_set_client_connection(async_client_conn_t conn); extern void async_set_interrupt_received(async_client_conn_t conn); +extern void async_set_pending(async_pending_t pend); /* Wrappers for simple communication */ #define async_msg_0(phone, method) \ - ipc_call_async_0((phone), (method), NULL, NULL, true) + ipc_call_async_0((phone), (method), NULL, NULL, true) #define async_msg_1(phone, method, arg1) \ - ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \ - true) + ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \ + true) #define async_msg_2(phone, method, arg1, arg2) \ - ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \ - true) + ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \ + true) #define async_msg_3(phone, method, arg1, arg2, arg3) \ - ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \ - true) + ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \ + true) #define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \ - ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ - NULL, true) + ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ + NULL, true) #define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \ - ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), NULL, NULL, true) + ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), NULL, NULL, true) /* @@ -123,72 +128,72 @@ */ #define async_req_0_0(phoneid, method) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \ - NULL) + 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) + 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) + 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) + 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) + 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)) + 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) + 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) + 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) + 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) + 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) + 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)) + 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) + 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) + 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) + 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) + 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) + 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)) + 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) + 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) + 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) + 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) + 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) + 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) \ @@ -196,15 +201,15 @@ (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) + 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) + 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) + 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) + 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) \ @@ -216,12 +221,12 @@ (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) + 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) + 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) + 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) \ @@ -254,6 +259,4 @@ } -extern atomic_t async_futex; - #endif