Changeset 84302 in webkit

Timestamp:

Apr 19, 2011 3:35:33 PM (13 years ago)

Author:

andersca@apple.com

Message:

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

Reviewed by Dan Bernstein.

Terminate hung plug-in processes after 45 seconds
​https://bugs.webkit.org/show_bug.cgi?id=58932
<rdar://problem/8083219>

• UIProcess/Plugins/PluginProcessManager.cpp: (WebKit::PluginProcessManager::pluginSyncMessageSendTimedOut): Find the plug-in process proxy and terminate it.

(WebKit::PluginProcessManager::pluginProcessWithPath):
Add new helper function.

(WebKit::PluginProcessManager::getOrCreatePluginProcess):
Call pluginProcessWithPath.

• UIProcess/Plugins/PluginProcessProxy.cpp: (WebKit::PluginProcessProxy::terminate): Terminate the process.

• UIProcess/Plugins/PluginProcessProxy.h:
• UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::pluginSyncMessageSendTimedOut): Call PluginProcessManager::pluginSyncMessageSendTimedOut.

• UIProcess/WebProcessProxy.h:
• UIProcess/WebProcessProxy.messages.in: Add PluginSyncMessageSendTimedOut message.

• WebProcess/Plugins/PluginProcessConnection.cpp: (WebKit::defaultSyncMessageTimeout): (WebKit::PluginProcessConnection::PluginProcessConnection): Set a sync message timeout on the plug-in process connection.

(WebKit::PluginProcessConnection::syncMessageSendTimedOut):
Send a message to the web process proxy.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginProcessManager.cpp (modified) (1 diff)
• UIProcess/Plugins/PluginProcessManager.h (modified) (1 diff)
• UIProcess/Plugins/PluginProcessProxy.cpp (modified) (1 diff)
• UIProcess/Plugins/PluginProcessProxy.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• UIProcess/WebProcessProxy.messages.in (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Terminate hung plug-in processes after 45 seconds
+        https://bugs.webkit.org/show_bug.cgi?id=58932
+        <rdar://problem/8083219>
+
+        * UIProcess/Plugins/PluginProcessManager.cpp:
+        (WebKit::PluginProcessManager::pluginSyncMessageSendTimedOut):
+        Find the plug-in process proxy and terminate it.
+
+        (WebKit::PluginProcessManager::pluginProcessWithPath):
+        Add new helper function.
+
+        (WebKit::PluginProcessManager::getOrCreatePluginProcess):
+        Call pluginProcessWithPath.
+
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        (WebKit::PluginProcessProxy::terminate):
+        Terminate the process.
+
+        * UIProcess/Plugins/PluginProcessProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::pluginSyncMessageSendTimedOut):
+        Call PluginProcessManager::pluginSyncMessageSendTimedOut.
+
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+        Add PluginSyncMessageSendTimedOut message.
+
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::defaultSyncMessageTimeout):
+        (WebKit::PluginProcessConnection::PluginProcessConnection):
+        Set a sync message timeout on the plug-in process connection.
+
+        (WebKit::PluginProcessConnection::syncMessageSendTimedOut):
+        Send a message to the web process proxy.
+
 2011-04-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp

@@ -75 +75 @@
 }
 
+void PluginProcessManager::pluginSyncMessageSendTimedOut(const String& pluginPath)
+{
+    PluginProcessProxy* pluginProcess = pluginProcessWithPath(pluginPath);
+    if (!pluginProcess)
+        return;
+
+    pluginProcess->terminate();
+}
+
+PluginProcessProxy* PluginProcessManager::pluginProcessWithPath(const String& pluginPath)
+{
+    for (size_t i = 0; i < m_pluginProcesses.size(); ++i) {
+        if (m_pluginProcesses[i]->pluginInfo().path == pluginPath)
+            return m_pluginProcesses[i];
+    }
+    return 0;
+}
+
 PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginInfoStore::Plugin& plugin)
 {
-    for (size_t i = 0; i < m_pluginProcesses.size(); ++i) {
-        if (m_pluginProcesses[i]->pluginInfo().path == plugin.path)
-            return m_pluginProcesses[i];
-    }
+    if (PluginProcessProxy* pluginProcess = pluginProcessWithPath(plugin.path))
+        return pluginProcess;
 
     PluginProcessProxy* pluginProcess = PluginProcessProxy::create(this, plugin).leakPtr();

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h

@@ -57 +57 @@
     void clearSiteData(const PluginInfoStore::Plugin&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
 
+    void pluginSyncMessageSendTimedOut(const String& pluginPath);
+
 private:
     PluginProcessManager();
 
     PluginProcessProxy* getOrCreatePluginProcess(const PluginInfoStore::Plugin&);
+    PluginProcessProxy* pluginProcessWithPath(const String& pluginPath);
 
     Vector<PluginProcessProxy*> m_pluginProcesses;

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

@@ -121 +121 @@
 }
 
+void PluginProcessProxy::terminate()
+{
+     m_processLauncher->terminateProcess();
+}
+
 void PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch()
 {

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

@@ -72 +72 @@
     // Asks the plug-in process to clear the data for the given sites.
     void clearSiteData(WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
+
+    // Terminates the plug-in process.
+    void terminate();
 
 private:

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -221 +221 @@
     PluginProcessManager::shared().getPluginProcessConnection(context()->pluginInfoStore(), pluginPath, reply);
 }
+
+void WebProcessProxy::pluginSyncMessageSendTimedOut(const String& pluginPath)
+{
+    PluginProcessManager::shared().pluginSyncMessageSendTimedOut(pluginPath);
+}
 #endif
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -123 +123 @@
 #if ENABLE(PLUGIN_PROCESS)
     void getPluginProcessConnection(const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
+    void pluginSyncMessageSendTimedOut(const String& pluginPath);
 #endif
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in

@@ -30 +30 @@
 #if ENABLE(PLUGIN_PROCESS)
     GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::MachPort connectionHandle) Delayed
+    PluginSyncMessageSendTimedOut(WTF::String pluginPath)
 #endif
 }

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

@@ -33 +33 @@
 #include "PluginProxy.h"
 #include "WebProcess.h"
+#include "WebProcessProxyMessages.h"
+#include <WebCore/FileSystem.h>
+
+using namespace WebCore;
 
 namespace WebKit {
+
+// The timeout, in seconds, when sending sync messages to the plug-in.
+static const double syncMessageTimeout = 45;
+
+static double defaultSyncMessageTimeout(const String& pluginPath)
+{
+    // We don't want a message timeout for the AppleConnect plug-in.
+    // FIXME: We should key this off something other than the path.
+    if (pathGetFileName(pluginPath) == "AppleConnect.plugin")
+        return CoreIPC::Connection::NoTimeout;
+
+    return syncMessageTimeout;
+}
 
 PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager* pluginProcessConnectionManager, const String& pluginPath, CoreIPC::Connection::Identifier connectionIdentifier)
@@ -41 +58 @@
 {
     m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
+
+    m_connection->setDefaultSyncMessageTimeout(defaultSyncMessageTimeout(m_pluginPath));
     m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
 
@@ -119 +138 @@
 void PluginProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
 {
+    WebProcess::shared().connection()->send(Messages::WebProcessProxy::PluginSyncMessageSendTimedOut(m_pluginPath), 0);
 }