Changeset 142212 in webkit

Timestamp:

Feb 7, 2013 5:22:05 PM (11 years ago)

Author:

barraclough@apple.com

Message:

PluginProcess should quit immediately if idle in response to low-memory notifications
​https://bugs.webkit.org/show_bug.cgi?id=109103
<rdar://problem/12679827>

Reviewed by Darin Adler.

Source/WebCore:

This patch allows a process to set a custom callback for low memory warnings
(defaulting to the current behaviour, as implemented in releaseMemory).

MemoryPressureHandler::install is currently used for two purposes - it is
called when first initializing a low memory handler for a process, and also
used to reinstall the handler (on a delay) after the notification has occured.
Since reinstallation doesn't change the callback, split these behaviours out -
MemoryPressureHandler::initialize is added to initialization, and accepts a
custom callback, install in made private.

• WebCore.exp.in:
  • Added export for releaseMemory.
• platform/MemoryPressureHandler.cpp:

(WebCore::MemoryPressureHandler::releaseMemory):

• Added null implementation for non-Mac builds.

• platform/MemoryPressureHandler.h:

(WebCore::MemoryPressureHandler::initialize):

• distinguish initialization from reinstallations, allow handler to be set.

(MemoryPressureHandler):

• Added m_lowMemoryHandler function pointer member variable.

• platform/mac/MemoryPressureHandlerMac.mm:

(WebCore::MemoryPressureHandler::respondToMemoryPressure):

• Call m_lowMemoryHandler instead of releaseMemory.

Source/WebKit/mac:

• WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):

• MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.

(WebInstallMemoryPressureHandler):

• MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.

Source/WebKit2:

PluginProcess now initializes a MemoryPressureHandler for the process, providing
a custom callback which will call terminate if appropriate (if the plugin is not
currently in use).

• PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::lowMemoryHandler):

• Custom callback to terminate if appropriate.

(WebKit::PluginProcess::initializeProcess):

• Initialize the MemoryPressureHandler.

(WebKit::PluginProcess::shouldTerminate):

• This method now also needs to be callable in situations where it might return false.

• PluginProcess/PluginProcess.h:

(PluginProcess):

• Added declaration for lowMemoryHandler.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):

• MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/MemoryPressureHandler.cpp (modified) (1 diff)
• WebCore/platform/MemoryPressureHandler.h (modified) (3 diffs)
• WebCore/platform/mac/MemoryPressureHandlerMac.mm (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/PluginProcess/PluginProcess.cpp (modified) (3 diffs)
• WebKit2/PluginProcess/PluginProcess.h (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-06  Gavin Barraclough  <barraclough@apple.com>
+
+        PluginProcess should quit immediately if idle in response to low-memory notifications
+        https://bugs.webkit.org/show_bug.cgi?id=109103
+        <rdar://problem/12679827>
+
+        Reviewed by Darin Adler.
+
+        This patch allows a process to set a custom callback for low memory warnings
+        (defaulting to the current behaviour, as implemented in releaseMemory).
+
+        MemoryPressureHandler::install is currently used for two purposes - it is
+        called when first initializing a low memory handler for a process, and also
+        used to reinstall the handler (on a delay) after the notification has occured.
+        Since reinstallation doesn't change the callback, split these behaviours out -
+        MemoryPressureHandler::initialize is added to initialization, and accepts a
+        custom callback, install in made private.
+
+        * WebCore.exp.in:
+            - Added export for releaseMemory.
+        * platform/MemoryPressureHandler.cpp:
+        (WebCore::MemoryPressureHandler::releaseMemory):
+            - Added null implementation for non-Mac builds.
+        * platform/MemoryPressureHandler.h:
+        (WebCore::MemoryPressureHandler::initialize):
+            - distinguish initialization from reinstallations, allow handler to be set.
+        (MemoryPressureHandler):
+            - Added m_lowMemoryHandler function pointer member variable.
+        * platform/mac/MemoryPressureHandlerMac.mm:
+        (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+            - Call m_lowMemoryHandler instead of releaseMemory.
+
 2013-02-07  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -601 +601 @@
 __ZN7WebCore20SpaceSplitStringDataD1Ev
 __ZN7WebCore21BackForwardController11itemAtIndexEi
+__ZN7WebCore21MemoryPressureHandler13releaseMemoryEb
 __ZN7WebCore21MemoryPressureHandler7installEv
 __ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -44 +44 @@
 
 #if !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
+
 void MemoryPressureHandler::install() { }
+void MemoryPressureHandler::uninstall() { }
+void MemoryPressureHandler::holdOff(unsigned) { }
+void MemoryPressureHandler::respondToMemoryPressure() { }
+void MemoryPressureHandler::releaseMemory(bool) { }
 
-void MemoryPressureHandler::uninstall() { }
-
-void MemoryPressureHandler::holdOff(unsigned) { }
-
-void MemoryPressureHandler::respondToMemoryPressure() { }
 #endif
  

trunk/Source/WebCore/platform/MemoryPressureHandler.h

@@ -32 +32 @@
 namespace WebCore {
 
+typedef void (*LowMemoryHandler)(bool critical);
+
 class MemoryPressureHandler {
     WTF_MAKE_FAST_ALLOCATED;
@@ -37 +39 @@
     friend MemoryPressureHandler& memoryPressureHandler();
 
+    void initialize(LowMemoryHandler handler = releaseMemory)
+    {
+        ASSERT(!m_installed);
+        m_lowMemoryHandler = handler;
+        install();
+    }
+
+private:
     void install();
     void uninstall();
@@ -42 +52 @@
     void holdOff(unsigned);
 
-private:
     MemoryPressureHandler();
     ~MemoryPressureHandler();
 
     void respondToMemoryPressure();
-    void releaseMemory(bool critical);
+    static void releaseMemory(bool critical);
 
     bool m_installed;
     time_t m_lastRespondTime;
+    LowMemoryHandler m_lowMemoryHandler;
 };
  

trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm

@@ -135 +135 @@
     double startTime = monotonicallyIncreasingTime();
 
-    releaseMemory(false);
+    ASSERT(m_lowMemoryHandler);
+    m_lowMemoryHandler(false);
 
     unsigned holdOffTime = (monotonicallyIncreasingTime() - startTime) * s_holdOffMultiplier;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-02-06  Gavin Barraclough  <barraclough@apple.com>
+
+        PluginProcess should quit immediately if idle in response to low-memory notifications
+        https://bugs.webkit.org/show_bug.cgi?id=109103
+        <rdar://problem/12679827>
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+            - MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.
+        (WebInstallMemoryPressureHandler):
+            - MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.
+
 2013-02-07  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -820 +820 @@
     [[self preferences] _postPreferencesChangedAPINotification];
 
-    memoryPressureHandler().install();
+    memoryPressureHandler().initialize();
 
     if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION)) {
@@ -6735 +6735 @@
 void WebInstallMemoryPressureHandler(void)
 {
-    memoryPressureHandler().install();
+    memoryPressureHandler().initialize();
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-06  Gavin Barraclough  <barraclough@apple.com>
+
+        PluginProcess should quit immediately if idle in response to low-memory notifications
+        https://bugs.webkit.org/show_bug.cgi?id=109103
+        <rdar://problem/12679827>
+
+        Reviewed by Darin Adler.
+
+        PluginProcess now initializes a MemoryPressureHandler for the process, providing
+        a custom callback which will call terminate if appropriate (if the plugin is not
+        currently in use).
+
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::lowMemoryHandler):
+            - Custom callback to terminate if appropriate.
+        (WebKit::PluginProcess::initializeProcess):
+            - Initialize the MemoryPressureHandler.
+        (WebKit::PluginProcess::shouldTerminate):
+            - This method now also needs to be callable in situations where it might return false.
+        * PluginProcess/PluginProcess.h:
+        (PluginProcess):
+            - Added declaration for lowMemoryHandler.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+            - MemoryPressureHandler::install is now called via MemoryPressureHandler::initialize.
+
 2013-02-07  KwangYong Choi  <ky0.choi@samsung.com>
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

@@ -37 +37 @@
 #include "PluginProcessProxyMessages.h"
 #include "WebProcessConnection.h"
+#include <WebCore/MemoryPressureHandler.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/RunLoop.h>
@@ -86 +87 @@
 }
 
+void PluginProcess::lowMemoryHandler(bool)
+{
+    if (shared().shouldTerminate())
+        shared().terminate();
+}
+
 void PluginProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
 {
     m_pluginPath = parameters.extraInitializationData.get("plugin-path");
     platformInitializeProcess(parameters);
+
+    memoryPressureHandler().initialize(lowMemoryHandler);
 }
 
@@ -126 +135 @@
 bool PluginProcess::shouldTerminate()
 {
-    ASSERT(m_webProcessConnections.isEmpty());
-
-    return true;
+    return m_webProcessConnections.isEmpty();
 }
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -109 +109 @@
     mach_port_t m_compositingRenderServerPort;
 #endif
+
+    static void lowMemoryHandler(bool critical);
 };
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -245 +245 @@
     platformInitializeWebProcess(parameters, decoder);
 
-    memoryPressureHandler().install();
+    memoryPressureHandler().initialize();
 
     RefPtr<APIObject> injectedBundleInitializationUserData;