Changeset 6b21292 in mainline

Timestamp:

2008-12-30T19:34:23Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3ad953c

Parents:

1c1002a

Message:

support for sending asynchronous messages (without preemption) in interrupt notification handler
any potential synchronization problems should be solved properly in the user code, not by an unconditional termination

Location:

uspace/lib/libc

Files:

• generic/async.c (modified) (10 diffs)
• include/async.h (modified) (1 diff)

uspace/lib/libc/generic/async.c

@@ -484 +484 @@
         connection_t *conn;
         unsigned long key;
-
+        
         conn = malloc(sizeof(*conn));
         if (!conn) {
@@ -499 +499 @@
         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) {
@@ -507 +507 @@
                 return NULL;
         }
+        
         /* Add connection to the connection hash table */
         key = conn->in_phone_hash;
@@ -512 +513 @@
         hash_table_insert(&conn_hash_table, &key, &conn->link);
         futex_up(&async_futex);
-
+        
         fibril_add_ready(conn->wdata.fid);
-
+        
         return conn->wdata.fid;
 }
@@ -525 +526 @@
  * @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)
@@ -534 +536 @@
                 _in_interrupt_handler = 0;
                 return;
-        }               
-
+        }
+        
         switch (IPC_GET_METHOD(*call)) {
         case IPC_M_CONNECT_ME_TO:
@@ -543 +545 @@
                 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);
@@ -740 +742 @@
 {
         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;
 }
@@ -782 +778 @@
 {
         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;
 }
@@ -885 +875 @@
         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);

uspace/lib/libc/include/async.h

@@ -119 +119 @@
  * 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 n is the number of return arguments. The macros decide between the fast
  * and slow verion based on m.
  */