<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181310] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181310">181310</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 22:32:49 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapIncrementalSweepercpp">trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapIncrementalSweeperh">trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181309 => 181310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-03-10 04:41:29 UTC (rev 181309)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-03-10 05:32:49 UTC (rev 181310)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-03-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Another build fix for Windows.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapIncrementalSweepercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp (181309 => 181310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp        2015-03-10 04:41:29 UTC (rev 181309)
+++ trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp        2015-03-10 05:32:49 UTC (rev 181310)
</span><span class="lines">@@ -60,6 +60,12 @@
</span><span class="cx"> CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IncrementalSweeper::fullSweep()
+{
+ while (hasWork())
+ doWork();
+}
+
</ins><span class="cx"> void IncrementalSweeper::doWork()
</span><span class="cx"> {
</span><span class="cx"> doSweep(WTF::monotonicallyIncreasingTime());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapIncrementalSweeperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h (181309 => 181310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h        2015-03-10 04:41:29 UTC (rev 181309)
+++ trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h        2015-03-10 05:32:49 UTC (rev 181310)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> public:
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> JS_EXPORT_PRIVATE IncrementalSweeper(Heap*, CFRunLoopRef);
</span><ins>+ JS_EXPORT_PRIVATE void fullSweep();
</ins><span class="cx"> #else
</span><span class="cx"> explicit IncrementalSweeper(VM*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> void doSweep(double startTime);
</span><span class="cx"> void scheduleTimer();
</span><span class="cx"> void cancelTimer();
</span><ins>+ bool hasWork() const { return !m_blocksToSweep.isEmpty(); }
</ins><span class="cx">
</span><span class="cx"> unsigned m_currentBlockToSweepIndex;
</span><span class="cx"> Vector<MarkedBlock*>& m_blocksToSweep;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181309 => 181310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-03-10 04:41:29 UTC (rev 181309)
+++ trunk/Source/WebCore/ChangeLog        2015-03-10 05:32:49 UTC (rev 181310)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-03-09 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Content Filtering] Give ContentFilter subclasses private constructors, and make them fast-allocated and non-copyable
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (181309 => 181310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm        2015-03-10 04:41:29 UTC (rev 181309)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm        2015-03-10 05:32:49 UTC (rev 181310)
</span><span class="lines">@@ -29,10 +29,12 @@
</span><span class="cx"> #import "DispatchSPI.h"
</span><span class="cx"> #import "IOSurfacePool.h"
</span><span class="cx"> #import "GCController.h"
</span><ins>+#import "JSDOMWindow.h"
</ins><span class="cx"> #import "JSDOMWindowBase.h"
</span><span class="cx"> #import "LayerPool.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><ins>+#import <JavaScriptCore/IncrementalSweeper.h>
</ins><span class="cx"> #import <mach/mach.h>
</span><span class="cx"> #import <mach/task_info.h>
</span><span class="cx"> #import <malloc/malloc.h>
</span><span class="lines">@@ -88,6 +90,13 @@
</span><span class="cx"> ReliefLogger log("Collecting JavaScript garbage");
</span><span class="cx"> gcController().garbageCollectNow();
</span><span class="cx"> }
</span><ins>+
+ // Do a full sweep of collected objects.
+ {
+ ReliefLogger log("Full JavaScript garbage sweep");
+ JSC::JSLockHolder lock(JSDOMWindow::commonVM());
+ JSDOMWindow::commonVM().heap.sweeper()->fullSweep();
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>