<!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>[166838] 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/166838">166838</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-04-05 13:06:57 -0700 (Sat, 05 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing files from <a href="http://trac.webkit.org/projects/webkit/changeset/166837">r166837</a>
* heap/GCLogging.cpp: Added.
(JSC::GCLogging::levelAsString):
(JSC::LoggingFunctor::LoggingFunctor):
(JSC::LoggingFunctor::~LoggingFunctor):
(JSC::LoggingFunctor::operator()):
(JSC::LoggingFunctor::log):
(JSC::LoggingFunctor::reviveCells):
(JSC::LoggingFunctor::returnValue):
(JSC::GCLogging::dumpObjectGraph):
* heap/GCLogging.h: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreheapGCLoggingcpp">trunk/Source/JavaScriptCore/heap/GCLogging.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCLoggingh">trunk/Source/JavaScriptCore/heap/GCLogging.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166837 => 166838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-05 20:05:04 UTC (rev 166837)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-05 20:06:57 UTC (rev 166838)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-04-05 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Add missing files from r166837
+
+ * heap/GCLogging.cpp: Added.
+ (JSC::GCLogging::levelAsString):
+ (JSC::LoggingFunctor::LoggingFunctor):
+ (JSC::LoggingFunctor::~LoggingFunctor):
+ (JSC::LoggingFunctor::operator()):
+ (JSC::LoggingFunctor::log):
+ (JSC::LoggingFunctor::reviveCells):
+ (JSC::LoggingFunctor::returnValue):
+ (JSC::GCLogging::dumpObjectGraph):
+ * heap/GCLogging.h: Added.
+
</ins><span class="cx"> 2014-04-04 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Enhanced GC logging
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCLoggingcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/heap/GCLogging.cpp (0 => 166838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCLogging.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/heap/GCLogging.cpp 2014-04-05 20:06:57 UTC (rev 166838)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GCLogging.h"
+
+#include "ClassInfo.h"
+#include "Heap.h"
+#include "HeapIterationScope.h"
+#include "JSCell.h"
+#include "JSCellInlines.h"
+
+namespace JSC {
+
+const char* GCLogging::levelAsString(Level level)
+{
+ switch (level) {
+ case None:
+ return "None";
+ case Basic:
+ return "Basic";
+ case Verbose:
+ return "Verbose";
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ return "";
+ }
+}
+
+class LoggingFunctor {
+public:
+ LoggingFunctor(SlotVisitor& slotVisitor)
+ : m_slotVisitor(slotVisitor)
+ {
+ m_savedMarkStack.resize(m_slotVisitor.markStack().size());
+ m_slotVisitor.markStack().fillVector(m_savedMarkStack);
+ }
+
+ ~LoggingFunctor()
+ {
+ reviveCells();
+ }
+
+ void operator()(JSCell* cell)
+ {
+ m_liveCells.append(cell);
+ MarkedBlock::blockFor(cell)->clearMarked(cell);
+ }
+
+ 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);
+ const_cast<JSCell*>(cell)->setRemembered(true);
+ }
+ }
+
+ 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();
+}
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCLoggingh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/heap/GCLogging.h (0 => 166838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCLogging.h (rev 0)
+++ trunk/Source/JavaScriptCore/heap/GCLogging.h 2014-04-05 20:06:57 UTC (rev 166838)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCLogging_h
+#define GCLogging_h
+
+#include <wtf/Assertions.h>
+
+namespace JSC {
+
+class Heap;
+
+class GCLogging {
+public:
+ enum Level : uint8_t {
+ None = 0,
+ Basic,
+ Verbose
+ };
+
+ static const char* levelAsString(Level);
+ static void dumpObjectGraph(Heap*);
+};
+
+typedef GCLogging::Level gcLogLevel;
+
+} // namespace JSC
+
+#endif // GCLogging_h
</ins></span></pre>
</div>
</div>
</body>
</html>