Changeset 203149 in webkit

Timestamp:

Jul 12, 2016, 9:05:06 PM (10 years ago)

Author:

akling@apple.com

Message:

[Cocoa] Simulated memory warning doesn't trigger libcache purge.
<​https://webkit.org/b/159688>

Reviewed by Chris Dumez.

Since simulated memory warnings will have the "is under memory pressure" flag set,
we were skipping the libcache purge call.

Add a separate flag that tracks whether we're under simulated pressure, and always
prod libcache in that case.

• platform/MemoryPressureHandler.h:
• platform/cocoa/MemoryPressureHandlerCocoa.mm:

(WebCore::MemoryPressureHandler::platformReleaseMemory):
(WebCore::MemoryPressureHandler::install):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MemoryPressureHandler.h (modified) (1 diff)
• platform/cocoa/MemoryPressureHandlerCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-12  Andreas Kling  <akling@apple.com>
+
+        [Cocoa] Simulated memory warning doesn't trigger libcache purge.
+        <https://webkit.org/b/159688>
+
+        Reviewed by Chris Dumez.
+
+        Since simulated memory warnings will have the "is under memory pressure" flag set,
+        we were skipping the libcache purge call.
+
+        Add a separate flag that tracks whether we're under simulated pressure, and always
+        prod libcache in that case.
+
+        * platform/MemoryPressureHandler.h:
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WebCore::MemoryPressureHandler::platformReleaseMemory):
+        (WebCore::MemoryPressureHandler::install):
+
 2016-07-12  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

trunk/Source/WebCore/platform/MemoryPressureHandler.h

@@ -144 +144 @@
 
     std::atomic<bool> m_underMemoryPressure;
+    bool m_isSimulatedMemoryPressure { false };
 
 #if PLATFORM(IOS)

trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm

@@ -80 +80 @@
 #endif
 
-    if (critical == Critical::Yes && !isUnderMemoryPressure()) {
+    if (critical == Critical::Yes && (!isUnderMemoryPressure() || m_isSimulatedMemoryPressure)) {
         // libcache listens to OS memory notifications, but for process suspension
         // or memory pressure simulation, we need to prod it manually:
@@ -140 +140 @@
     // Allow simulation of memory pressure with "notifyutil -p org.WebKit.lowMemory"
     notify_register_dispatch("org.WebKit.lowMemory", &_notifyToken, dispatch_get_main_queue(), ^(int) {
+        m_isSimulatedMemoryPressure = true;
+
 #if ENABLE(FMW_FOOTPRINT_COMPARISON)
         auto footprintBefore = pagesPerVMTag();
@@ -161 +163 @@
         dispatch_async(dispatch_get_main_queue(), ^{
             MemoryPressureHandler::singleton().setUnderMemoryPressure(wasUnderMemoryPressure);
+            m_isSimulatedMemoryPressure = false;
         });
     });