Changeset 184720 in webkit

Timestamp:

May 21, 2015 10:45:21 AM (9 years ago)

Author:

Chris Dumez

Message:

Regression(r179293): We no longer call destroyDecodedData() on CachedResources on memory pressure
​https://bugs.webkit.org/show_bug.cgi?id=145270
<rdar://problem/20734901>

Reviewed by Andreas Kling.

We no longer call destroyDecodedData() on CachedResources on memory
pressure after r179293. In r179293, we started calling
MemoryCache::evictResources() on memory pressure instead of
MemoryCache::pruneToPercentage(0). However, unlike
MemoryCache::pruneToPercentage(), it appears
MemoryCache::evictResources() removes the CachedResources from the
memory cache without calling destroyDecodedData() on them.
This caused a regression on Membuster.

This patch now calls MemoryCache::pruneLiveResourcesToSize(0) on
critical memory pressure, instead of evictResources(). We don't need to
call pruneDeadResourcesToSize(0) here because the non-critical memory
pressure handler already takes care of this.

During local testing, this change seemed to decrease the overall memory
usage of WebProcesses by ~10MB on Membuster (tested on Yosemite).

• platform/MemoryPressureHandler.cpp:

(WebCore::MemoryPressureHandler::releaseNoncriticalMemory):
(WebCore::MemoryPressureHandler::releaseCriticalMemory):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MemoryPressureHandler.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-21  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r179293): We no longer call destroyDecodedData() on CachedResources on memory pressure
+        https://bugs.webkit.org/show_bug.cgi?id=145270
+        <rdar://problem/20734901>
+
+        Reviewed by Andreas Kling.
+
+        We no longer call destroyDecodedData() on CachedResources on memory
+        pressure after r179293. In r179293, we started calling
+        MemoryCache::evictResources() on memory pressure instead of
+        MemoryCache::pruneToPercentage(0). However, unlike
+        MemoryCache::pruneToPercentage(), it appears
+        MemoryCache::evictResources() removes the CachedResources from the
+        memory cache without calling destroyDecodedData() on them.
+        This caused a regression on Membuster.
+
+        This patch now calls MemoryCache::pruneLiveResourcesToSize(0) on
+        critical memory pressure, instead of evictResources(). We don't need to
+        call pruneDeadResourcesToSize(0) here because the non-critical memory
+        pressure handler already takes care of this.
+
+        During local testing, this change seemed to decrease the overall memory
+        usage of WebProcesses by ~10MB on Membuster (tested on Yosemite).
+
+        * platform/MemoryPressureHandler.cpp:
+        (WebCore::MemoryPressureHandler::releaseNoncriticalMemory):
+        (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
 2015-05-21  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -96 +96 @@
 
     {
-        ReliefLogger log("Evict MemoryCache dead resources");
+        ReliefLogger log("Prune MemoryCache dead resources");
         MemoryCache::singleton().pruneDeadResourcesToSize(0);
     }
@@ -111 +111 @@
 
     {
-        ReliefLogger log("Evict all MemoryCache resources");
-        MemoryCache::singleton().evictResources();
+        ReliefLogger log("Prune MemoryCache live resources");
+        MemoryCache::singleton().pruneLiveResourcesToSize(0);
     }