Changeset 180666 in webkit

Timestamp:

Feb 26, 2015 12:15:04 AM (9 years ago)

Author:

akling@apple.com

Message:

[Cocoa] Prod libcache to drop caches in memory pressure relief handler.
<​https://webkit.org/b/142024>
<rdar://problem/19966096>

Reviewed by Antti Koivisto.

libcache already listens to the OS memory pressure notifications, but we still
need to manually request a cleanup when doing an iOS process suspension, or when
simulating memory pressure.

• platform/cocoa/MemoryPressureHandlerCocoa.mm:

(WebCore::MemoryPressureHandler::platformReleaseMemory): Call out to libcache's
cache_simulate_memory_warning_event() to make sure that nonessential objects
being kept alive by NSCaches get dropped when we need the memory.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-26  Andreas Kling  <akling@apple.com>
+
+        [Cocoa] Prod libcache to drop caches in memory pressure relief handler.
+        <https://webkit.org/b/142024>
+        <rdar://problem/19966096>
+
+        Reviewed by Antti Koivisto.
+
+        libcache already listens to the OS memory pressure notifications, but we still
+        need to manually request a cleanup when doing an iOS process suspension, or when
+        simulating memory pressure.
+
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WebCore::MemoryPressureHandler::platformReleaseMemory): Call out to libcache's
+        cache_simulate_memory_warning_event() to make sure that nonessential objects
+        being kept alive by NSCaches get dropped when we need the memory.
+
 2015-02-25  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2011-2014 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2011-2015 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45 +45 @@
 #endif
 
+extern "C" void cache_simulate_memory_warning_event(uint64_t);
+
 namespace WebCore {
 
-void MemoryPressureHandler::platformReleaseMemory(bool)
+void MemoryPressureHandler::platformReleaseMemory(bool critical)
 {
     {
@@ -59 +61 @@
         IOSurfacePool::sharedPool().discardAllSurfaces();
     }
+#endif
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    if (critical && !isUnderMemoryPressure()) {
+        // libcache listens to OS memory notifications, but for process suspension
+        // or memory pressure simulation, we need to prod it manually:
+        ReliefLogger log("Purging libcache caches");
+        cache_simulate_memory_warning_event(DISPATCH_MEMORYPRESSURE_CRITICAL);
+    }
+#else
+    UNUSED_PARAM(critical);
 #endif