Changeset 181310 in webkit

Timestamp:

Mar 9, 2015 10:32:49 PM (9 years ago)

Author:

Chris Dumez

Message:

[iOS] Sweep all collected objects on critical memory pressure
​https://bugs.webkit.org/show_bug.cgi?id=142457
<rdar://problem/20044440>

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

All fullSweep() API to IncrementalSweeper so that we can call it in the
memory pressure handler.

• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::fullSweep):

• heap/IncrementalSweeper.h:

(JSC::IncrementalSweeper::hasWork):

Source/WebCore:

Do a full sweep of objects marked for destruction on critical memory
pressure to free up memory.

• platform/cocoa/MemoryPressureHandlerCocoa.mm:

(WebCore::MemoryPressureHandler::platformReleaseMemory):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/heap/IncrementalSweeper.cpp (modified) (1 diff)
• JavaScriptCore/heap/IncrementalSweeper.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-09  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Sweep all collected objects on critical memory pressure
+        https://bugs.webkit.org/show_bug.cgi?id=142457
+        <rdar://problem/20044440>
+
+        Reviewed by Geoffrey Garen.
+
+        All fullSweep() API to IncrementalSweeper so that we can call it in the
+        memory pressure handler.
+
+        * heap/IncrementalSweeper.cpp:
+        (JSC::IncrementalSweeper::fullSweep):
+        * heap/IncrementalSweeper.h:
+        (JSC::IncrementalSweeper::hasWork):
+
 2015-03-09  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

@@ -59 +59 @@
 {
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
+}
+
+void IncrementalSweeper::fullSweep()
+{
+    while (hasWork())
+        doWork();
 }
 

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h

@@ -39 +39 @@
 #if USE(CF)
     JS_EXPORT_PRIVATE IncrementalSweeper(Heap*, CFRunLoopRef);
+    JS_EXPORT_PRIVATE void fullSweep();
 #else
     explicit IncrementalSweeper(VM*);
@@ -53 +54 @@
     void scheduleTimer();
     void cancelTimer();
+    bool hasWork() const { return !m_blocksToSweep.isEmpty(); }
     
     unsigned m_currentBlockToSweepIndex;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-09  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Sweep all collected objects on critical memory pressure
+        https://bugs.webkit.org/show_bug.cgi?id=142457
+        <rdar://problem/20044440>
+
+        Reviewed by Geoffrey Garen.
+
+        Do a full sweep of objects marked for destruction on critical memory
+        pressure to free up memory.
+
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WebCore::MemoryPressureHandler::platformReleaseMemory):
+
 2015-03-09  Andy Estes  <aestes@apple.com>
 

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

@@ -30 +30 @@
 #import "IOSurfacePool.h"
 #import "GCController.h"
+#import "JSDOMWindow.h"
 #import "JSDOMWindowBase.h"
 #import "LayerPool.h"
 #import "Logging.h"
 #import "WebCoreSystemInterface.h"
+#import <JavaScriptCore/IncrementalSweeper.h>
 #import <mach/mach.h>
 #import <mach/task_info.h>
@@ -88 +90 @@
         ReliefLogger log("Collecting JavaScript garbage");
         gcController().garbageCollectNow();
+    }
+
+    // Do a full sweep of collected objects.
+    {
+        ReliefLogger log("Full JavaScript garbage sweep");
+        JSC::JSLockHolder lock(JSDOMWindow::commonVM());
+        JSDOMWindow::commonVM().heap.sweeper()->fullSweep();
     }
 #endif