Changeset 41269bd in mainline

Timestamp:

2006-06-07T17:28:39Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ce5bcb4

Parents:

70178b74

Message:

Fixed race condition in async framework on phone disconnect.

Files:

• console/console.c (modified) (2 diffs)
• fb/fb.c (modified) (1 diff)
• libc/generic/async.c (modified) (5 diffs)

console/console.c

@@ -289 +289 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        ipc_answer_fast(callid,0,0,0);
                         /* TODO: Handle hangup */
                         return;
@@ -369 +368 @@
                                 break;
                         }
-                        
-                        /* Commit hangup */
-                        ipc_answer_fast(callid, 0,0,0);
                         conn->used = 0;
                         return;

fb/fb.c

@@ -922 +922 @@
                         for (i=1; i < MAX_VIEWPORTS; i++)
                                 vport->initialized = 0;
-                        ipc_answer_fast(callid,0,0,0);
                         return; /* Exit thread */
 

libc/generic/async.c

@@ -132 +132 @@
         ipc_callid_t callid;
         ipc_call_t call;
+        ipc_callid_t close_callid; /* Identification of closing packet */
         void (*cthread)(ipc_callid_t,ipc_call_t *);
 } connection_t;
@@ -267 +268 @@
         msg->call = *call;
         list_append(&msg->link, &conn->msg_queue);
+
+        if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP)
+                conn->close_callid = callid;
         
         /* If the call is waiting for event, run it */
@@ -359 +363 @@
         unsigned long key;
         msg_t *msg;
+        int close_answered = 0;
 
         /* Setup thread local connection pointer */
@@ -372 +377 @@
                 msg = list_get_instance(PS_connection->msg_queue.next, msg_t, link);
                 list_remove(&msg->link);
+                if (msg->callid == PS_connection->close_callid)
+                        close_answered = 1;
                 ipc_answer_fast(msg->callid, EHANGUP, 0, 0);
                 free(msg);
         }
+        if (PS_connection->close_callid)
+                ipc_answer_fast(PS_connection->close_callid, 0, 0, 0);
 }
 
@@ -407 +416 @@
         list_initialize(&conn->msg_queue);
         conn->callid = callid;
+        conn->close_callid = 0;
         if (call)
                 conn->call = *call;