Changeset 70085 in webkit

Timestamp:

Oct 19, 2010 2:11:29 PM (14 years ago)

Author:

andersca@apple.com

Message:

Stop waiting for sync replies if the connection is closed
​https://bugs.webkit.org/show_bug.cgi?id=47930

Reviewed by Adam Roben.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::Connection):
Initialize m_shouldWaitForSyncReplies to true.

(CoreIPC::Connection::sendSyncMessage):
Don't attempt to send a message if m_shouldWaitForSyncReplies is false.

(CoreIPC::Connection::waitForSyncReply):
Return if m_shouldWaitForSyncReplies was set to false.

(CoreIPC::Connection::connectionDidClose):
Set m_shouldWaitForSyncReplies to true and signal the semaphore.

• Platform/CoreIPC/Connection.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (7 diffs)
• Platform/CoreIPC/Connection.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Stop waiting for sync replies if the connection is closed
+        https://bugs.webkit.org/show_bug.cgi?id=47930
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::Connection):
+        Initialize m_shouldWaitForSyncReplies to true.
+
+        (CoreIPC::Connection::sendSyncMessage):
+        Don't attempt to send a message if m_shouldWaitForSyncReplies is false.
+
+        (CoreIPC::Connection::waitForSyncReply):
+        Return if m_shouldWaitForSyncReplies was set to false.
+
+        (CoreIPC::Connection::connectionDidClose):
+        Set m_shouldWaitForSyncReplies to true and signal the semaphore.
+
+        * Platform/CoreIPC/Connection.h:
+
 2010-10-19  Adam Roben  <aroben@apple.com>
 

trunk/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -52 +52 @@
     , m_connectionQueue("com.apple.CoreIPC.ReceiveQueue")
     , m_clientRunLoop(clientRunLoop)
+    , m_shouldWaitForSyncReplies(true)
 {
     ASSERT(m_client);
@@ -166 +167 @@
     // Push the pending sync reply information on our stack.
     {
-        MutexLocker locker(m_pendingSyncRepliesMutex);
+        MutexLocker locker(m_syncReplyStateMutex);
+        if (!m_shouldWaitForSyncReplies)
+            return 0;
+
         m_pendingSyncReplies.append(PendingSyncReply(syncRequestID));
     }
@@ -178 +182 @@
     // Finally, pop the pending sync reply information.
     {
-        MutexLocker locker(m_pendingSyncRepliesMutex);
+        MutexLocker locker(m_syncReplyStateMutex);
         ASSERT(m_pendingSyncReplies.last().syncRequestID == syncRequestID);
         m_pendingSyncReplies.removeLast();
@@ -193 +197 @@
     while (!timedOut) {
         {
-            MutexLocker locker(m_pendingSyncRepliesMutex);
+            MutexLocker locker(m_syncReplyStateMutex);
 
             // First, check if there is a sync reply at the top of the stack.
@@ -201 +205 @@
             ASSERT(pendingSyncReply.syncRequestID == syncRequestID);
             
-            // We found the sync reply, return it.
-            if (pendingSyncReply.didReceiveReply)
+            // We found the sync reply, or the connection was closed.
+            if (pendingSyncReply.didReceiveReply || !m_shouldWaitForSyncReplies)
                 return pendingSyncReply.releaseReplyDecoder();
         }
@@ -218 +222 @@
     // Check if this is a sync reply.
     if (messageID == MessageID(CoreIPCMessage::SyncMessageReply)) {
-        MutexLocker locker(m_pendingSyncRepliesMutex);
+        MutexLocker locker(m_syncReplyStateMutex);
         ASSERT(!m_pendingSyncReplies.isEmpty());
 
@@ -254 +258 @@
     // The connection is now invalid.
     platformInvalidate();
-    
+
+    {
+        MutexLocker locker(m_syncReplyStateMutex);
+
+        ASSERT(m_shouldWaitForSyncReplies);
+        m_shouldWaitForSyncReplies = false;
+
+        if (!m_pendingSyncReplies.isEmpty())
+            m_waitForSyncReplySemaphore.signal();
+    }
+
     m_clientRunLoop->scheduleWork(WorkItem::create(this, &Connection::dispatchConnectionDidClose));
 }

trunk/WebKit2/Platform/CoreIPC/Connection.h

@@ -229 +229 @@
     BinarySemaphore m_waitForSyncReplySemaphore;
 
-    Mutex m_pendingSyncRepliesMutex;
+    Mutex m_syncReplyStateMutex;
+    bool m_shouldWaitForSyncReplies;
     Vector<PendingSyncReply> m_pendingSyncReplies;