<!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>[167948] 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/167948">167948</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-04-29 11:20:05 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Zombifying sweep should ignore retired blocks.
<https://webkit.org/b/132344>
Reviewed by Mark Hahnenberg.
By definition, retired blocks do not have "dead" objects, or at least
none that we know of yet until the next marking phase has been run
over it. So, we should not be sweeping them (even for zombie mode).
* heap/Heap.cpp:
(JSC::Heap::zombifyDeadObjects):
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::zombifySweep):
* heap/MarkedSpace.h:
(JSC::ZombifySweep::operator()):</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="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167947 => 167948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-04-29 18:09:09 UTC (rev 167947)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-04-29 18:20:05 UTC (rev 167948)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-04-29 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Zombifying sweep should ignore retired blocks.
+ <https://webkit.org/b/132344>
+
+ Reviewed by Mark Hahnenberg.
+
+ By definition, retired blocks do not have "dead" objects, or at least
+ none that we know of yet until the next marking phase has been run
+ over it. So, we should not be sweeping them (even for zombie mode).
+
+ * heap/Heap.cpp:
+ (JSC::Heap::zombifyDeadObjects):
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::zombifySweep):
+ * heap/MarkedSpace.h:
+ (JSC::ZombifySweep::operator()):
+
+2014-04-29 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Fix bit rot in zombie mode heap code.
</span><span class="cx"> <https://webkit.org/b/132342>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (167947 => 167948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp        2014-04-29 18:09:09 UTC (rev 167947)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp        2014-04-29 18:20:05 UTC (rev 167948)
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx"> {
</span><span class="cx"> SamplingRegion samplingRegion("Garbage Collection: Sweeping");
</span><span class="cx"> DelayedReleaseScope delayedReleaseScope(m_objectSpace);
</span><del>- m_objectSpace.sweep();
</del><ins>+ m_objectSpace.zombifySweep();
</ins><span class="cx"> }
</span><span class="cx"> HeapIterationScope iterationScope(*this);
</span><span class="cx"> m_objectSpace.forEachDeadCell<Zombify>(iterationScope);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (167947 => 167948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp        2014-04-29 18:09:09 UTC (rev 167947)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp        2014-04-29 18:20:05 UTC (rev 167948)
</span><span class="lines">@@ -127,6 +127,14 @@
</span><span class="cx"> forEachBlock<Sweep>();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MarkedSpace::zombifySweep()
+{
+ if (Options::logGC())
+ dataLog("Zombifying sweep...");
+ m_heap->sweeper()->willFinishSweeping();
+ forEachBlock<ZombifySweep>();
+}
+
</ins><span class="cx"> void MarkedSpace::resetAllocators()
</span><span class="cx"> {
</span><span class="cx"> for (size_t cellSize = preciseStep; cellSize <= preciseCutoff; cellSize += preciseStep) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (167947 => 167948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h        2014-04-29 18:09:09 UTC (rev 167947)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h        2014-04-29 18:20:05 UTC (rev 167948)
</span><span class="lines">@@ -63,6 +63,14 @@
</span><span class="cx"> void operator()(MarkedBlock* block) { block->sweep(); }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct ZombifySweep : MarkedBlock::VoidFunctor {
+ void operator()(MarkedBlock* block)
+ {
+ if (block->needsSweeping())
+ block->sweep();
+ }
+};
+
</ins><span class="cx"> struct MarkCount : MarkedBlock::CountFunctor {
</span><span class="cx"> void operator()(MarkedBlock* block) { count(block->markCount()); }
</span><span class="cx"> };
</span><span class="lines">@@ -121,6 +129,7 @@
</span><span class="cx"> void clearRememberedSet();
</span><span class="cx"> void clearNewlyAllocated();
</span><span class="cx"> void sweep();
</span><ins>+ void zombifySweep();
</ins><span class="cx"> size_t objectCount();
</span><span class="cx"> size_t size();
</span><span class="cx"> size_t capacity();
</span></span></pre>
</div>
</div>
</body>
</html>