Changeset 185704 in webkit

Timestamp:

Jun 18, 2015 10:15:50 AM (9 years ago)

Author:

Antti Koivisto

Message:

~4% Membuster regression after WebKit r185452
​https://bugs.webkit.org/show_bug.cgi?id=146112
rdar://problem/21406677

Reviewed by Chris Dumez.

Clear the cache write queue on critical memory pressure. There can be substantial amount of memory there and we
don't know how long writing it out will take. System is often under I/O pressure too in low memory situations.

This also makes sense for process suspension where we send simulated critical memory event.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::lowMemoryHandler):

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::handleMemoryPressureNotification):

• NetworkProcess/cache/NetworkCache.h:
• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::clearWriteQueue):

• NetworkProcess/cache/NetworkCacheStorage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.h (modified) (2 diffs)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-18  Antti Koivisto  <antti@apple.com>
+
+        ~4% Membuster regression after WebKit r185452
+        https://bugs.webkit.org/show_bug.cgi?id=146112
+        rdar://problem/21406677
+
+        Reviewed by Chris Dumez.
+
+        Clear the cache write queue on critical memory pressure. There can be substantial amount of memory there and we
+        don't know how long writing it out will take. System is often under I/O pressure too in low memory situations.
+
+        This also makes sense for process suspension where we send simulated critical memory event.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::lowMemoryHandler):
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::handleMemoryPressureNotification):
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::clearWriteQueue):
+        * NetworkProcess/cache/NetworkCacheStorage.h:
+
 2015-06-18  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -177 +177 @@
 {
     platformLowMemoryHandler(critical);
+#if ENABLE(NETWORK_CACHE)
+    if (NetworkCache::singleton().isEnabled())
+        NetworkCache::singleton().handleMemoryPressureNotification(critical);
+#endif
     WTF::releaseFastMallocFreeMemory();
 }

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

@@ -563 +563 @@
 }
 
+void Cache::handleMemoryPressureNotification(WebCore::Critical critical)
+{
+    if (critical != WebCore::Critical::Yes)
+        return;
+    // There can be substantial amount of memory in the write queue and we don't know how long it will take to write it out.
+    // We may also be about to suspend the process.
+    if (m_storage)
+        m_storage->clearWriteQueue();
+}
+
 String Cache::recordsPath() const
 {

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

@@ -32 +32 @@
 #include "NetworkCacheStorage.h"
 #include "ShareableResource.h"
+#include <WebCore/MemoryPressureHandler.h>
 #include <WebCore/ResourceResponse.h>
 #include <wtf/text/WTFString.h>
@@ -104 +105 @@
     void clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler);
 
+    void handleMemoryPressureNotification(WebCore::Critical);
+
     void dumpContentsToFile();
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -863 +863 @@
 }
 
+void Storage::clearWriteQueue()
+{
+    LOG(NetworkCacheStorage, "(NetworkProcess) clearing write queue");
+
+    m_pendingWriteOperations.clear();
+}
+
 void Storage::deleteOldVersions()
 {

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h

@@ -80 +80 @@
     // Null record signals end.
     void traverse(TraverseFlags, TraverseHandler&&);
+
+    void clearWriteQueue();
 
     void setCapacity(size_t);