Changeset 085bd54 in mainline for libc/generic/async.c

Timestamp:

2006-06-06T15:16:08Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

63bb83e

Parents:

d7eafd8

Message:

Revised ipc. Now it is preferrable to use only functions from async.h, they
take care of correct buffering, waiting for answers etc.

File:

• libc/generic/async.c (modified) (15 diffs)

libc/generic/async.c

@@ -135 +135 @@
 } connection_t;
 
-
+/** Identifier of incoming connection handled by current thread */
 __thread connection_t *PS_connection;
+/** If true, it is forbidden to use async_req functions and
+ *  all preemption is disabled */
+__thread int in_interrupt_handler;
 
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
@@ -226 +229 @@
 
         wd->timedout = 0;
+        wd->inlist = 1;
 
         tmp = timeout_list.next;
@@ -295 +299 @@
         conn = PS_connection; 
 
-        if (usecs < 0) /* TODO: let it get through the ipc_call once */
-                return 0;
-
         futex_down(&async_futex);
 
@@ -308 +309 @@
         /* If nothing in queue, wait until something appears */
         while (list_empty(&conn->msg_queue)) {
-                if (usecs) {
-                        conn->wdata.inlist = 1;
+                if (usecs)
                         insert_timeout(&conn->wdata);
-                }
+
                 conn->wdata.active = 0;
                 psthread_schedule_next_adv(PS_TO_MANAGER);
@@ -363 +363 @@
         PS_connection = (connection_t *)arg;
         PS_connection->cthread(PS_connection->callid, &PS_connection->call);
-
         /* Remove myself from connection hash table */
         futex_down(&async_futex);
@@ -436 +435 @@
         switch (IPC_GET_METHOD(*call)) {
         case IPC_M_INTERRUPT:
+                in_interrupt_handler = 1;
                 (*interrupt_received)(callid,call);
+                in_interrupt_handler = 0;
                 return;
         case IPC_M_CONNECT_ME_TO:
@@ -486 +487 @@
 
 /** Endless loop dispatching incoming calls and answers */
-int async_manager(void)
+static int async_manager_worker(void)
 {
         ipc_call_t call;
@@ -522 +523 @@
                 }
 
-                if (callid & IPC_CALLID_ANSWERED)
+                if (callid & IPC_CALLID_ANSWERED) {
                         continue;
+                }
 
                 handle_call(callid, &call);
@@ -538 +540 @@
 static int async_manager_thread(void *arg)
 {
+        in_interrupt_handler = 0; // TODO: Handle TLS better
         futex_up(&async_futex); /* async_futex is always locked when entering
                                 * manager */
-        async_manager();
+        async_manager_worker();
 }
 
@@ -608 +611 @@
         amsg_t *msg;
 
+        if (in_interrupt_handler) {
+                printf("Cannot send asynchronou request in interrupt handler.\n");
+                _exit(1);
+        }
+
         msg = malloc(sizeof(*msg));
         msg->done = 0;
@@ -628 +636 @@
 {
         amsg_t *msg;
+
+        if (in_interrupt_handler) {
+                printf("Cannot send asynchronou request in interrupt handler.\n");
+                _exit(1);
+        }
 
         msg = malloc(sizeof(*msg));
@@ -699 +712 @@
         msg->wdata.ptid = psthread_get_id();
         msg->wdata.active = 0;
-        msg->wdata.inlist = 1;
-
         insert_timeout(&msg->wdata);
 
@@ -726 +737 @@
         amsg_t *msg;
         
+        if (in_interrupt_handler) {
+                printf("Cannot call async_usleep in interrupt handler.\n");
+                _exit(1);
+        }
+
         msg = malloc(sizeof(*msg));
         if (!msg)
@@ -731 +747 @@
 
         msg->wdata.ptid = psthread_get_id();
-        msg->wdata.inlist = 1;
         msg->wdata.active = 0;
 
@@ -757 +772 @@
         interrupt_received = conn;
 }
+
+/* Primitive functions for simple communication */
+void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
+                 ipcarg_t arg2, ipcarg_t arg3)
+{
+        ipc_call_async_3(phoneid, method, arg1, arg2, arg3, NULL, NULL, !in_interrupt_handler);
+}
+
+void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2)
+{
+        ipc_call_async_2(phoneid, method, arg1, arg2, NULL, NULL, !in_interrupt_handler);
+}