<!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>[161429] trunk/Source/JavaScriptCore</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/161429">161429</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-01-07 09:39:52 -0800 (Tue, 07 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Heap::collect shouldn't be responsible for sweeping
https://bugs.webkit.org/show_bug.cgi?id=126556
Reviewed by Geoffrey Garen.
Sweeping happens at an awkward time during collection due to the fact that destructors can
cause arbitrary reentry into the VM. This patch separates collecting and sweeping, and delays
sweeping until after collection has completely finished.
* heap/Heap.cpp:
(JSC::Heap::collectAllGarbage):
(JSC::Heap::collect):
(JSC::Heap::collectIfNecessaryOrDefer):
* heap/Heap.h:
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::sweep):
* runtime/GCActivityCallback.cpp:
(JSC::DefaultGCActivityCallback::doWork):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGCActivityCallbackcpp">trunk/Source/JavaScriptCore/runtime/GCActivityCallback.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161428 => 161429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-07 17:34:59 UTC (rev 161428)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-07 17:39:52 UTC (rev 161429)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-06 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Heap::collect shouldn't be responsible for sweeping
+ https://bugs.webkit.org/show_bug.cgi?id=126556
+
+ Reviewed by Geoffrey Garen.
+
+ Sweeping happens at an awkward time during collection due to the fact that destructors can
+ cause arbitrary reentry into the VM. This patch separates collecting and sweeping, and delays
+ sweeping until after collection has completely finished.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::collectAllGarbage):
+ (JSC::Heap::collect):
+ (JSC::Heap::collectIfNecessaryOrDefer):
+ * heap/Heap.h:
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::sweep):
+ * runtime/GCActivityCallback.cpp:
+ (JSC::DefaultGCActivityCallback::doWork):
+
</ins><span class="cx"> 2014-01-07 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/126567> Remove the legacy WebKit availability macros
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (161428 => 161429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-07 17:34:59 UTC (rev 161428)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-07 17:39:52 UTC (rev 161429)
</span><span class="lines">@@ -727,14 +727,18 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_isSafeToCollect)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ collect();
+
+ SamplingRegion samplingRegion("Garbage Collection: Sweeping");
</ins><span class="cx"> DelayedReleaseScope delayedReleaseScope(m_objectSpace);
</span><del>- collect(DoSweep);
</del><ins>+ m_objectSpace.sweep();
+ m_objectSpace.shrink();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static double minute = 60.0;
</span><span class="cx">
</span><del>-void Heap::collect(SweepToggle sweepToggle)
</del><ins>+void Heap::collect()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(ALLOCATION_LOGGING)
</span><span class="cx"> dataLogF("JSC GC starting collection.\n");
</span><span class="lines">@@ -742,7 +746,7 @@
</span><span class="cx">
</span><span class="cx"> double before = 0;
</span><span class="cx"> if (Options::logGC()) {
</span><del>- dataLog("[GC", sweepToggle == DoSweep ? " (eager sweep)" : "", ": ");
</del><ins>+ dataLog("[GC: ");
</ins><span class="cx"> before = currentTimeMS();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -815,13 +819,6 @@
</span><span class="cx"> m_vm->clearSourceProviderCaches();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sweepToggle == DoSweep) {
- SamplingRegion samplingRegion("Garbage Collection: Sweeping");
- GCPHASE(Sweeping);
- m_objectSpace.sweep();
- m_objectSpace.shrink();
- }
-
</del><span class="cx"> m_sweeper->startSweeping(m_blockSnapshot);
</span><span class="cx"> m_bytesAbandoned = 0;
</span><span class="cx">
</span><span class="lines">@@ -880,7 +877,7 @@
</span><span class="cx"> if (!shouldCollect())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- collect(DoNotSweep);
</del><ins>+ collect();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (161428 => 161429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-07 17:34:59 UTC (rev 161428)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-07 17:39:52 UTC (rev 161429)
</span><span class="lines">@@ -139,9 +139,8 @@
</span><span class="cx"> bool isSafeToCollect() const { return m_isSafeToCollect; }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void collectAllGarbage();
</span><del>- enum SweepToggle { DoNotSweep, DoSweep };
</del><span class="cx"> bool shouldCollect();
</span><del>- void collect(SweepToggle);
</del><ins>+ void collect();
</ins><span class="cx"> bool collectIfNecessaryOrDefer(); // Returns true if it did collect.
</span><span class="cx">
</span><span class="cx"> void reportExtraMemoryCost(size_t cost);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (161428 => 161429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2014-01-07 17:34:59 UTC (rev 161428)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2014-01-07 17:39:52 UTC (rev 161429)
</span><span class="lines">@@ -120,6 +120,8 @@
</span><span class="cx">
</span><span class="cx"> void MarkedSpace::sweep()
</span><span class="cx"> {
</span><ins>+ if (Options::logGC())
+ dataLog("Eagerly sweeping...");
</ins><span class="cx"> m_heap->sweeper()->willFinishSweeping();
</span><span class="cx"> forEachBlock<Sweep>();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGCActivityCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GCActivityCallback.cpp (161428 => 161429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GCActivityCallback.cpp 2014-01-07 17:34:59 UTC (rev 161428)
+++ trunk/Source/JavaScriptCore/runtime/GCActivityCallback.cpp 2014-01-07 17:39:52 UTC (rev 161429)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- heap->collect(Heap::DoNotSweep);
</del><ins>+ heap->collect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CF)
</span></span></pre>
</div>
</div>
</body>
</html>