Index: uspace/lib/libc/generic/async.c =================================================================== --- uspace/lib/libc/generic/async.c (revision 95912659addfecdffc43b537a52e25be76dcf8f3) +++ uspace/lib/libc/generic/async.c (revision f2f03920b9cbe70ec1fa65df9ff172eba44647a4) @@ -257,7 +257,5 @@ } -/*************************************************/ - -/** Try to route a call to an appropriate connection thread +/** Try to route a call to an appropriate connection fibril * */ @@ -303,5 +301,5 @@ } -/** Return new incoming message for current(thread-local) connection */ +/** Return new incoming message for the current (fibril-local) connection */ ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs) { @@ -354,5 +352,5 @@ } -/** Thread function that gets created on new connection +/** Fibril function that gets created on new connection * * This function is defined as a weak symbol - to be redefined in @@ -367,10 +365,12 @@ } -/** Wrapper for client connection thread - * - * When new connection arrives, thread with this function is created. - * It calls client_connection and does final cleanup. - * - * @param arg Connection structure pointer +/** Wrapper for client connection fibril. + * + * When new connection arrives, a fibril with this implementing function is + * created. It calls client_connection() and does the final cleanup. + * + * @param arg Connection structure pointer + * + * @return Always zero. */ static int connection_fibril(void *arg) @@ -380,5 +380,5 @@ int close_answered = 0; - /* Setup thread local connection pointer */ + /* Setup fibril-local connection pointer */ FIBRIL_connection = (connection_t *) arg; FIBRIL_connection->cfibril(FIBRIL_connection->callid, @@ -407,17 +407,16 @@ } -/** Create new thread for a new connection - * - * Creates new thread for connection, fills in connection - * structures and inserts it into the hash table, so that - * later we can easily do routing of messages to particular - * threads. - * - * @param in_phone_hash Identification of the incoming connection - * @param callid Callid of the IPC_M_CONNECT_ME_TO packet - * @param call Call data of the opening packet - * @param cfibril Fibril function that should be called upon - * opening the connection - * @return New fibril id. +/** Create a new fibril for a new connection. + * + * Creates new fibril for connection, fills in connection structures and inserts + * it into the hash table, so that later we can easily do routing of messages to + * particular fibrils. + * + * @param in_phone_hash Identification of the incoming connection + * @param callid Callid of the IPC_M_CONNECT_ME_TO packet + * @param call Call data of the opening packet + * @param cfibril Fibril function that should be called upon + * opening the connection + * @return New fibril id. */ fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid, @@ -458,5 +457,5 @@ } -/** Handle call that was received */ +/** Handle a call that was received. */ static void handle_call(ipc_callid_t callid, ipc_call_t *call) { @@ -471,5 +470,5 @@ switch (IPC_GET_METHOD(*call)) { case IPC_M_CONNECT_ME_TO: - /* Open new connection with thread etc. */ + /* Open new connection with fibril etc. */ async_new_connection(IPC_GET_ARG3(*call), callid, call, client_connection); @@ -485,7 +484,5 @@ } -/** Fire all timeouts that expired - * - */ +/** Fire all timeouts that expired. */ static void handle_expired_timeouts(void) { @@ -506,5 +503,5 @@ waiter->inlist = 0; waiter->timedout = 1; - /* Redundant condition? The thread should not + /* Redundant condition? The fibril should not * be active when it gets here. */ @@ -531,5 +528,5 @@ futex_up(&async_futex); /* async_futex is always held - * when entering manager thread + * when entering manager fibril */ continue; @@ -567,10 +564,8 @@ } -/** Function to start async_manager as a standalone thread +/** Function to start async_manager as a standalone fibril. * * When more kernel threads are used, one async manager should - * exist per thread. The particular implementation may change, - * currently one async_manager is started automatically per kernel - * thread except the main thread. + * exist per thread. */ static int async_manager_fibril(void *arg) @@ -615,6 +610,5 @@ * Notify the fibril which is waiting for this message, that it arrived */ -static void reply_received(void *private, int retval, - ipc_call_t *data) +static void reply_received(void *private, int retval, ipc_call_t *data) { amsg_t *msg = (amsg_t *) private; @@ -647,5 +641,5 @@ */ aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipc_call_t *dataptr) + ipc_call_t *dataptr) { amsg_t *msg; @@ -674,5 +668,5 @@ */ aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipcarg_t arg3, ipc_call_t *dataptr) + ipcarg_t arg3, ipc_call_t *dataptr) { amsg_t *msg; @@ -697,8 +691,7 @@ /** Wait for a message sent by async framework * - * @param amsgid Message ID to wait for - * @param retval Pointer to variable where will be stored retval - * of the answered message. If NULL, it is ignored. - * + * @param amsgid Message ID to wait for + * @param retval Pointer to variable where will be stored retval of the + * answered message. If NULL, it is ignored. */ void async_wait_for(aid_t amsgid, ipcarg_t *retval) @@ -794,13 +787,13 @@ futex_down(&async_futex); insert_timeout(&msg->wdata); - /* Leave locked async_futex when entering this function */ + /* Leave locked the async_futex when entering this function */ fibril_schedule_next_adv(FIBRIL_TO_MANAGER); - /* futex is up automatically after fibril_schedule_next...*/ + /* futex is up automatically after fibril_schedule_next_adv()...*/ free(msg); } -/** Set function that is called, IPC_M_CONNECT_ME_TO is received - * - * @param conn Function that will form new psthread. +/** Set function that is called when IPC_M_CONNECT_ME_TO is received. + * + * @param conn Function that will form a new fibril. */ void async_set_client_connection(async_client_conn_t conn)