<!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>[178884] 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/178884">178884</a></dd>
<dt>Author</dt> <dd>mhahnenb@gmail.com</dd>
<dt>Date</dt> <dd>2015-01-21 18:56:26 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change Heap::m_compiledCode to use a Vector
https://bugs.webkit.org/show_bug.cgi?id=140717
Reviewed by Andreas Kling.
Right now it's a DoublyLinkedList, which is iterated during each
collection. This contributes to some of the longish Eden pause times.
A Vector would be more appropriate and would also allow ExecutableBase
to be 2 pointers smaller.
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode):
(JSC::Heap::deleteAllUnlinkedFunctionCode):
(JSC::Heap::clearUnmarkedExecutables):
* heap/Heap.h:
* runtime/Executable.h: No longer need to inherit from DoublyLinkedListNode.</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="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178883 => 178884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 02:08:00 UTC (rev 178883)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 02:56:26 UTC (rev 178884)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-21 Mark Hahnenberg <mhahnenb@gmail.com>
+
+ Change Heap::m_compiledCode to use a Vector
+ https://bugs.webkit.org/show_bug.cgi?id=140717
+
+ Reviewed by Andreas Kling.
+
+ Right now it's a DoublyLinkedList, which is iterated during each
+ collection. This contributes to some of the longish Eden pause times.
+ A Vector would be more appropriate and would also allow ExecutableBase
+ to be 2 pointers smaller.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+ (JSC::Heap::deleteAllUnlinkedFunctionCode):
+ (JSC::Heap::clearUnmarkedExecutables):
+ * heap/Heap.h:
+ * runtime/Executable.h: No longer need to inherit from DoublyLinkedListNode.
+
</ins><span class="cx"> 2015-01-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> BytecodeGenerator shouldn't expose all of its member variables
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (178883 => 178884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-22 02:08:00 UTC (rev 178883)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-22 02:56:26 UTC (rev 178884)
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx">
</span><del>- for (ExecutableBase* current = m_compiledCode.head(); current; current = current->next()) {
</del><ins>+ for (ExecutableBase* current : m_compiledCode) {
</ins><span class="cx"> if (!current->isFunctionExecutable())
</span><span class="cx"> continue;
</span><span class="cx"> static_cast<FunctionExecutable*>(current)->clearCodeIfNotCompiling();
</span><span class="lines">@@ -915,7 +915,7 @@
</span><span class="cx">
</span><span class="cx"> void Heap::deleteAllUnlinkedFunctionCode()
</span><span class="cx"> {
</span><del>- for (ExecutableBase* current = m_compiledCode.head(); current; current = current->next()) {
</del><ins>+ for (ExecutableBase* current : m_compiledCode) {
</ins><span class="cx"> if (!current->isFunctionExecutable())
</span><span class="cx"> continue;
</span><span class="cx"> static_cast<FunctionExecutable*>(current)->clearUnlinkedCodeForRecompilationIfNotCompiling();
</span><span class="lines">@@ -925,16 +925,16 @@
</span><span class="cx"> void Heap::clearUnmarkedExecutables()
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(ClearUnmarkedExecutables);
</span><del>- ExecutableBase* next;
- for (ExecutableBase* current = m_compiledCode.head(); current; current = next) {
- next = current->next();
</del><ins>+ for (unsigned i = m_compiledCode.size(); i--;) {
+ ExecutableBase* current = m_compiledCode[i];
</ins><span class="cx"> if (isMarked(current))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // We do this because executable memory is limited on some platforms and because
</span><span class="cx"> // CodeBlock requires eager finalization.
</span><span class="cx"> ExecutableBase::clearCodeVirtual(current);
</span><del>- m_compiledCode.remove(current);
</del><ins>+ std::swap(m_compiledCode[i], m_compiledCode.last());
+ m_compiledCode.removeLast();
</ins><span class="cx"> }
</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 (178883 => 178884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-01-22 02:08:00 UTC (rev 178883)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-01-22 02:56:26 UTC (rev 178884)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> double m_lastEdenGCLength;
</span><span class="cx"> double m_lastCodeDiscardTime;
</span><span class="cx">
</span><del>- DoublyLinkedList<ExecutableBase> m_compiledCode;
</del><ins>+ Vector<ExecutableBase*> m_compiledCode;
</ins><span class="cx">
</span><span class="cx"> RefPtr<GCActivityCallback> m_fullActivityCallback;
</span><span class="cx"> RefPtr<GCActivityCallback> m_edenActivityCallback;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (178883 => 178884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2015-01-22 02:08:00 UTC (rev 178883)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2015-01-22 02:56:26 UTC (rev 178884)
</span><span class="lines">@@ -63,8 +63,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class ExecutableBase : public JSCell, public DoublyLinkedListNode<ExecutableBase> {
- friend class WTF::DoublyLinkedListNode<ExecutableBase>;
</del><ins>+class ExecutableBase : public JSCell {
</ins><span class="cx"> friend class JIT;
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -271,9 +270,6 @@
</span><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ExecutableBase* m_prev;
- ExecutableBase* m_next;
-
</del><span class="cx"> RefPtr<JITCode> m_jitCodeForCall;
</span><span class="cx"> RefPtr<JITCode> m_jitCodeForConstruct;
</span><span class="cx"> MacroAssemblerCodePtr m_jitCodeForCallWithArityCheck;
</span></span></pre>
</div>
</div>
</body>
</html>