Changeset 85573 in webkit

Timestamp:

May 2, 2011 6:48:32 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-02 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

The web process locks up when the plug-in process crashes
​https://bugs.webkit.org/show_bug.cgi?id=59999
<rdar://problem/8889303>

Add a hash map from plug-in paths to CoreIPC connections to PluginProcessConnectionManager.
Add PluginProcessConnectionManager::pluginProcessCrashed and make it look up the corresponding
CoreIPC connection and call postConnectionDidCloseOnConnectionWorkQueue on it.

• Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::postConnectionDidCloseOnConnectionWorkQueue):
• Platform/CoreIPC/Connection.h:
• WebProcess/Plugins/PluginProcessConnectionManager.cpp: (WebKit::PluginProcessConnectionManager::getPluginProcessConnection): (WebKit::PluginProcessConnectionManager::removePluginProcessConnection): (WebKit::PluginProcessConnectionManager::pluginProcessCrashed):
• WebProcess/Plugins/PluginProcessConnectionManager.h:
• WebProcess/WebProcess.cpp: (WebKit::WebProcess::pluginProcessCrashed):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (1 diff)
• Platform/CoreIPC/Connection.h (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnectionManager.cpp (modified) (2 diffs)
• WebProcess/Plugins/PluginProcessConnectionManager.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-02  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        The web process locks up when the plug-in process crashes
+        https://bugs.webkit.org/show_bug.cgi?id=59999
+        <rdar://problem/8889303>
+
+        Add a hash map from plug-in paths to CoreIPC connections to PluginProcessConnectionManager.
+        Add PluginProcessConnectionManager::pluginProcessCrashed and make it look up the corresponding
+        CoreIPC connection and call postConnectionDidCloseOnConnectionWorkQueue on it.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::postConnectionDidCloseOnConnectionWorkQueue):
+        * Platform/CoreIPC/Connection.h:
+        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+        (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+        (WebKit::PluginProcessConnectionManager::removePluginProcessConnection):
+        (WebKit::PluginProcessConnectionManager::pluginProcessCrashed):
+        * WebProcess/Plugins/PluginProcessConnectionManager.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::pluginProcessCrashed):
+
 2011-05-02  Anders Carlsson  <andersca@apple.com>
 

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

@@ -551 +551 @@
 }
 
+void Connection::postConnectionDidCloseOnConnectionWorkQueue()
+{
+    m_connectionQueue.scheduleWork(WorkItem::create(this, &Connection::connectionDidClose));
+}
+
 void Connection::connectionDidClose()
 {

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

@@ -148 +148 @@
     void setDefaultSyncMessageTimeout(double);
 
+    void postConnectionDidCloseOnConnectionWorkQueue();
+
     static const int DefaultTimeout = 0;
     static const int NoTimeout = -1;

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp

@@ -76 +76 @@
     m_pluginProcessConnections.append(pluginProcessConnection);
 
+    {
+        MutexLocker locker(m_pathsAndConnectionsMutex);
+        ASSERT(!m_pathsAndConnections.contains(pluginProcessConnection->pluginPath()));
+
+        m_pathsAndConnections.set(pluginPath, pluginProcessConnection->connection());
+    }
+
     return pluginProcessConnection.get();
 }
@@ -84 +91 @@
     ASSERT(vectorIndex != notFound);
 
+    {
+        MutexLocker locker(m_pathsAndConnectionsMutex);
+        ASSERT(m_pathsAndConnections.contains(pluginProcessConnection->pluginPath()));
+        
+        m_pathsAndConnections.remove(pluginProcessConnection->pluginPath());
+    }
+
     m_pluginProcessConnections.remove(vectorIndex);
+}
+
+void PluginProcessConnectionManager::pluginProcessCrashed(const String& pluginPath)
+{
+    MutexLocker locker(m_pathsAndConnectionsMutex);
+    CoreIPC::Connection* connection = m_pathsAndConnections.get(pluginPath).get();
+
+    // It's OK for connection to be null here; it will happen if this web process doesn't know
+    // anything about the plug-in process.
+    if (!connection)
+        return;
+
+    connection->postConnectionDidCloseOnConnectionWorkQueue();
 }
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h

@@ -30 +30 @@
 
 #include <wtf/Forward.h>
+#include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/Threading.h>
 #include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
 
 // Manages plug-in process connections for the given web process.
+
+namespace CoreIPC {
+    class Connection;
+}
 
 namespace WebKit {
@@ -48 +55 @@
     void removePluginProcessConnection(PluginProcessConnection*);
 
+    // Called on the web process connection work queue.
+    void pluginProcessCrashed(const String& pluginPath);
+
 private:
     Vector<RefPtr<PluginProcessConnection> > m_pluginProcessConnections;
+
+    Mutex m_pathsAndConnectionsMutex;
+    HashMap<String, RefPtr<CoreIPC::Connection> > m_pathsAndConnections;
 };
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -797 +797 @@
 void WebProcess::pluginProcessCrashed(const String& pluginPath)
 {
-    // FIXME: Implement.
+    m_pluginProcessConnectionManager.pluginProcessCrashed(pluginPath);
 }
 #endif