Changeset 84288 in webkit

Timestamp:

Apr 19, 2011 1:47:21 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Alexey Proskuryakov.

Replace the didFailToSendSyncMessage Connection::Client function with a flag
​https://bugs.webkit.org/show_bug.cgi?id=58923

• Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::Connection): Initialize m_shouldExitOnSyncMessageSendFailure to false.

(CoreIPC::Connection::setShouldExitOnSyncMessageSendFailure):
Set m_didCloseOnConnectionWorkQueueCallback.

(CoreIPC::Connection::sendSyncMessage):
Call didFailToSendSyncMessage if we fail to send the sync message for some reason.

(CoreIPC::Connection::didFailToSendSyncMessage):
if m_shouldExitOnSyncMessageSendFailure is true, exit.

• Platform/CoreIPC/Connection.h: Remove didFailToSendSyncMessage from Connection::Client.

• PluginProcess/PluginProcess.cpp:
• PluginProcess/PluginProcess.h: Remove didFailToSendSyncMessage.

• WebProcess/WebProcess.cpp: (WebKit::WebProcess::initialize):
• WebProcess/WebProcess.h: Remove didFailToSendSyncMessage. Call setShouldExitOnSyncMessageSendFailure on our UI process connection.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (5 diffs)
• Platform/CoreIPC/Connection.h (modified) (4 diffs)
• PluginProcess/PluginProcess.cpp (modified) (1 diff)
• PluginProcess/PluginProcess.h (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Replace the didFailToSendSyncMessage Connection::Client function with a flag
+        https://bugs.webkit.org/show_bug.cgi?id=58923
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::Connection):
+        Initialize m_shouldExitOnSyncMessageSendFailure to false.
+
+        (CoreIPC::Connection::setShouldExitOnSyncMessageSendFailure):
+        Set m_didCloseOnConnectionWorkQueueCallback.
+
+        (CoreIPC::Connection::sendSyncMessage):
+        Call didFailToSendSyncMessage if we fail to send the sync message for some reason.
+
+        (CoreIPC::Connection::didFailToSendSyncMessage):
+        if m_shouldExitOnSyncMessageSendFailure is true, exit.
+
+        * Platform/CoreIPC/Connection.h:
+        Remove didFailToSendSyncMessage from Connection::Client.
+
+        * PluginProcess/PluginProcess.cpp:
+        * PluginProcess/PluginProcess.h:
+        Remove didFailToSendSyncMessage.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initialize):
+        * WebProcess/WebProcess.h:
+        Remove didFailToSendSyncMessage. Call setShouldExitOnSyncMessageSendFailure on our
+        UI process connection.
+
 2011-04-19  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -198 +198 @@
     , m_syncRequestID(0)
     , m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(false)
+    , m_shouldExitOnSyncMessageSendFailure(false)
     , m_didCloseOnConnectionWorkQueueCallback(0)
     , m_isConnected(false)
@@ -228 +229 @@
 }
 
+void Connection::setShouldExitOnSyncMessageSendFailure(bool shouldExitOnSyncMessageSendFailure)
+{
+    ASSERT(!m_isConnected);
+
+    m_shouldExitOnSyncMessageSendFailure = shouldExitOnSyncMessageSendFailure;
+}
+
 void Connection::setDidCloseOnConnectionWorkQueueCallback(DidCloseOnConnectionWorkQueueCallback callback)
 {
@@ -359 +367 @@
     ASSERT(RunLoop::current() == m_clientRunLoop);
 
-    if (!isValid())
+    if (!isValid()) {
+        didFailToSendSyncMessage();
         return 0;
-    
+    }
+
     // Push the pending sync reply information on our stack.
     {
         MutexLocker locker(m_syncReplyStateMutex);
         if (!m_shouldWaitForSyncReplies) {
-            m_client->didFailToSendSyncMessage(this);
+            didFailToSendSyncMessage();
             return 0;
         }
@@ -388 +398 @@
     }
 
-    if (!reply && m_client)
-        m_client->didFailToSendSyncMessage(this);
+    if (!reply)
+        didFailToSendSyncMessage();
 
     return reply.release();
@@ -593 +603 @@
 }
 
+void Connection::didFailToSendSyncMessage()
+{
+    if (!m_shouldExitOnSyncMessageSendFailure)
+        return;
+
+    exit(0);
+}
+
 void Connection::enqueueIncomingMessage(IncomingMessage& incomingMessage)
 {

trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

@@ -94 +94 @@
         virtual void didClose(Connection*) = 0;
         virtual void didReceiveInvalidMessage(Connection*, MessageID) = 0;
-        virtual void didFailToSendSyncMessage(Connection*) { }
 
 #if PLATFORM(WIN)
@@ -121 +120 @@
 
     void setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(bool);
+    void setShouldExitOnSyncMessageSendFailure(bool shouldExitOnSyncMessageSendFailure);
 
     // The set callback will be called on the connection work queue when the connection is closed, 
@@ -217 +217 @@
     void dispatchMessages();
     void dispatchSyncMessage(MessageID, ArgumentDecoder*);
+    void didFailToSendSyncMessage();
 
     // Can be called on any thread.
@@ -226 +227 @@
 
     bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
+    bool m_shouldExitOnSyncMessageSendFailure;
     DidCloseOnConnectionWorkQueueCallback m_didCloseOnConnectionWorkQueueCallback;
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

@@ -125 +125 @@
 }
 
-NO_RETURN void PluginProcess::didFailToSendSyncMessage(CoreIPC::Connection*)
-{
-    // We were making a synchronous call to a web process that doesn't exist any more.
-    // Callers are unlikely to be prepared for an error like this, so it's best to exit immediately.
-    exit(0);
-}
-    
 void PluginProcess::initializePluginProcess(const PluginProcessCreationParameters& parameters)
 {

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -72 +72 @@
     virtual void didClose(CoreIPC::Connection*);
     virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
-    virtual void didFailToSendSyncMessage(CoreIPC::Connection*);
 
     // Message handlers.

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -149 +149 @@
     m_connection = CoreIPC::Connection::createClientConnection(serverIdentifier, this, runLoop);
     m_connection->setDidCloseOnConnectionWorkQueueCallback(didCloseOnConnectionWorkQueue);
+    m_connection->setShouldExitOnSyncMessageSendFailure(true);
 
     m_connection->open();
@@ -666 +667 @@
 }
 
-NO_RETURN void WebProcess::didFailToSendSyncMessage(CoreIPC::Connection*)
-{
-    // We were making a synchronous call to a UI process that doesn't exist any more.
-    // Callers are unlikely to be prepared for an error like this, so it's best to exit immediately.
-    exit(0);
-}
-
 WebFrame* WebProcess::webFrame(uint64_t frameID) const
 {

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -173 +173 @@
     void didClose(CoreIPC::Connection*);
     void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
-    NO_RETURN void didFailToSendSyncMessage(CoreIPC::Connection*);
 #if PLATFORM(WIN)
     Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();