Changeset 2e07d27e in mainline

Timestamp:

2009-11-28T16:50:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

19528516, 3f35634c, a1622091

Parents:

67392fa (diff), 8c8f8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fix for ticket #151.

File:

• uspace/lib/libc/generic/async.c (modified) (2 diffs)

uspace/lib/libc/generic/async.c

@@ -392 +392 @@
         /* If nothing in queue, wait until something arrives */
         while (list_empty(&conn->msg_queue)) {
+                if (conn->close_callid) {
+                        /*
+                         * Handle the case when the connection was already
+                         * closed by the client but the server did not notice
+                         * the first IPC_M_PHONE_HUNGUP call and continues to
+                         * call async_get_call_timeout(). Repeat
+                         * IPC_M_PHONE_HUNGUP until the caller notices. 
+                         */
+                        memset(call, 0, sizeof(ipc_call_t));
+                        IPC_SET_METHOD(*call, IPC_M_PHONE_HUNGUP);
+                        futex_up(&async_futex);
+                        return conn->close_callid;
+                }
+
                 if (usecs)
                         async_insert_timeout(&conn->wdata);
@@ -528 +542 @@
         list_initialize(&conn->msg_queue);
         conn->callid = callid;
-        conn->close_callid = false;
+        conn->close_callid = 0;
         
         if (call)