WebSVN – HelenOS – Diff – /branches/network/uspace/lib/libc/generic/async.c

 fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
+{
     connection_t *conn;
     unsigned long key;
     conn = malloc(sizeof(*conn));
     if (!conn) {
         if (callid)
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     conn->close_callid = 0;
     if (call)
         conn->call = *call;
     conn->wdata.active = 1; /* We will activate the fibril ASAP */
     conn->cfibril = cfibril;
     conn->wdata.fid = fibril_create(connection_fibril, conn);
     if (!conn->wdata.fid) {
         free(conn);
         if (callid)
             ipc_answer_0(callid, ENOMEM);
         return NULL;
+    }
     /* Add connection to the connection hash table */
     key = conn->in_phone_hash;
     futex_down(&async_futex);
     hash_table_insert(&conn_hash_table, &key, &conn->link);
     futex_up(&async_futex);
     fibril_add_ready(conn->wdata.fid);
     return conn->wdata.fid;
+}
 /** Handle a call that was received.
+ *
  * If the call has the IPC_M_CONNECT_ME_TO method, a new connection is created.
  * Otherwise the call is routed to its connection fibril.
+ *
  * @param callid    Hash of the incoming call.
  * @param call      Data of the incoming call.
+ *
  */
 static void handle_call(ipc_callid_t callid, ipc_call_t *call)
+{
     /* Unrouted call - do some default behaviour */
     if ((callid & IPC_CALLID_NOTIFICATION)) {
         _in_interrupt_handler = 1;
         (*interrupt_received)(callid, call);
         _in_interrupt_handler = 0;
         return;
     }
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_CONNECT_ME_TO:
         /* Open new connection with fibril etc. */
         async_new_connection(IPC_GET_ARG5(*call), callid, call,
             client_connection);
         return;
+    }
     /* Try to route the call through the connection hash table */
     if (route_call(callid, call))
         return;
     /* Unknown call from unknown phone - hang it up */
     ipc_answer_0(callid, EHANGUP);
+}
 /** Fire all timeouts that expired. */
  */
 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) {
-        printf("Cannot send asynchronous request in interrupt "
-            "handler.\n");
-        _exit(1);
-    }
     msg = malloc(sizeof(*msg));
     msg->done = 0;
     msg->dataptr = dataptr;
     /* We may sleep in the next method, but it will use its own mechanism */
     msg->wdata.active = 1;
     ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg,
-        reply_received, 1);
+        reply_received, !_in_interrupt_handler);
     return (aid_t) msg;
+}
 /** Send message and return id of the sent message
+ *
 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) {
-        printf("Cannot send asynchronous request in interrupt "
-            "handler.\n");
-        _exit(1);
-    }
     msg = malloc(sizeof(*msg));
     msg->done = 0;
     msg->dataptr = dataptr;
     /* We may sleep in next method, but it will use its own mechanism */
     msg->wdata.active = 1;
     ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg,
-        reply_received, 1);
+        reply_received, !_in_interrupt_handler);
     return (aid_t) msg;
+}
 /** Wait for a message sent by the async framework.
+ *
  */
 void async_usleep(suseconds_t timeout)
+{
     amsg_t *msg;
-    if (_in_interrupt_handler) {
-        printf("Cannot call async_usleep in interrupt handler.\n");
-        _exit(1);
-    }
     msg = malloc(sizeof(*msg));
     if (!msg)
         return;
     msg->wdata.fid = fibril_get_id();
     msg->wdata.active = 0;
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     futex_down(&async_futex);
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
     /* futex is up automatically after fibril_switch()...*/

Subversion Repositories HelenOS

(root)/branches/network/uspace/lib/libc/generic/async.c – Rev 3386 → 4153