<!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>[203000] 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/203000">203000</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 11:56:31 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dumping the object graph doesn't work with verbose GC logging
https://bugs.webkit.org/show_bug.cgi?id=159569
Reviewed by Mark Lam.
The current object graph logging code tries to revisits the graph. This doesn't work
correctly and asking around it isn't used. The only way to dump the true object graph
is to log while we GC and that has obvious performance implications.
Therefore I eliminated GCLogging::dumpObjectGraph() and related code.
* heap/GCLogging.cpp:
(JSC::GCLogging::levelAsString):
(JSC::LoggingFunctor::LoggingFunctor): Deleted.
(JSC::LoggingFunctor::~LoggingFunctor): Deleted.
(JSC::LoggingFunctor::operator()): Deleted.
(JSC::LoggingFunctor::log): Deleted.
(JSC::LoggingFunctor::reviveCells): Deleted.
(JSC::LoggingFunctor::returnValue): Deleted.
(JSC::GCLogging::dumpObjectGraph): Deleted.
* heap/Heap.cpp:
(JSC::Heap::didFinishCollection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCLoggingcpp">trunk/Source/JavaScriptCore/heap/GCLogging.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202999 => 203000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-08 18:52:34 UTC (rev 202999)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-08 18:56:31 UTC (rev 203000)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-07-08 Michael Saboff <msaboff@apple.com>
+
+ Dumping the object graph doesn't work with verbose GC logging
+ https://bugs.webkit.org/show_bug.cgi?id=159569
+
+ Reviewed by Mark Lam.
+
+ The current object graph logging code tries to revisits the graph. This doesn't work
+ correctly and asking around it isn't used. The only way to dump the true object graph
+ is to log while we GC and that has obvious performance implications.
+ Therefore I eliminated GCLogging::dumpObjectGraph() and related code.
+
+ * heap/GCLogging.cpp:
+ (JSC::GCLogging::levelAsString):
+ (JSC::LoggingFunctor::LoggingFunctor): Deleted.
+ (JSC::LoggingFunctor::~LoggingFunctor): Deleted.
+ (JSC::LoggingFunctor::operator()): Deleted.
+ (JSC::LoggingFunctor::log): Deleted.
+ (JSC::LoggingFunctor::reviveCells): Deleted.
+ (JSC::LoggingFunctor::returnValue): Deleted.
+ (JSC::GCLogging::dumpObjectGraph): Deleted.
+ * heap/Heap.cpp:
+ (JSC::Heap::didFinishCollection):
+
</ins><span class="cx"> 2016-07-08 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> speculateTypedArrayIsNotNeutered has an inverted speculation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCLogging.cpp (202999 => 203000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCLogging.cpp 2016-07-08 18:52:34 UTC (rev 202999)
+++ trunk/Source/JavaScriptCore/heap/GCLogging.cpp 2016-07-08 18:56:31 UTC (rev 203000)
</span><span class="lines">@@ -50,69 +50,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class LoggingFunctor {
-public:
- LoggingFunctor(SlotVisitor& slotVisitor)
- : m_slotVisitor(slotVisitor)
- {
- m_savedMarkStack.resize(m_slotVisitor.markStack().size());
- m_slotVisitor.markStack().fillVector(m_savedMarkStack);
- }
-
- ~LoggingFunctor()
- {
- reviveCells();
- }
-
- IterationStatus operator()(JSCell* cell)
- {
- m_liveCells.append(cell);
- MarkedBlock::blockFor(cell)->clearMarked(cell);
- return IterationStatus::Continue;
- }
-
- void log()
- {
- m_slotVisitor.clearMarkStack();
- for (JSCell* cell : m_liveCells) {
- cell->methodTable()->visitChildren(cell, m_slotVisitor);
- dataLog("\n", *cell, ":\n", m_slotVisitor);
- for (const JSCell* neighbor : m_slotVisitor.markStack())
- MarkedBlock::blockFor(neighbor)->clearMarked(neighbor);
- m_slotVisitor.clearMarkStack();
- }
- m_slotVisitor.reset();
- }
-
- void reviveCells()
- {
- for (JSCell* cell : m_liveCells)
- MarkedBlock::blockFor(cell)->setMarked(cell);
-
- for (const JSCell* cell : m_savedMarkStack) {
- m_slotVisitor.markStack().append(cell);
- cell->setCellState(CellState::OldGrey);
- }
- }
-
- typedef void ReturnType;
-
- void returnValue() { };
-
-private:
- Vector<const JSCell*> m_savedMarkStack;
- Vector<JSCell*> m_liveCells;
- SlotVisitor& m_slotVisitor;
-};
-
-void GCLogging::dumpObjectGraph(Heap* heap)
-{
- LoggingFunctor loggingFunctor(heap->m_slotVisitor);
- HeapIterationScope iterationScope(*heap);
- heap->objectSpace().forEachLiveCell(iterationScope, loggingFunctor);
- loggingFunctor.log();
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (202999 => 203000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-07-08 18:52:34 UTC (rev 202999)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-07-08 18:56:31 UTC (rev 203000)
</span><span class="lines">@@ -1463,9 +1463,6 @@
</span><span class="cx"> if (Options::dumpObjectStatistics())
</span><span class="cx"> HeapStatistics::dumpObjectStatistics(this);
</span><span class="cx">
</span><del>- if (Options::logGC() == GCLogging::Verbose)
- GCLogging::dumpObjectGraph(this);
-
</del><span class="cx"> if (HeapProfiler* heapProfiler = m_vm->heapProfiler()) {
</span><span class="cx"> gatherExtraHeapSnapshotData(*heapProfiler);
</span><span class="cx"> removeDeadHeapSnapshotNodes(*heapProfiler);
</span></span></pre>
</div>
</div>
</body>
</html>