<!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>[179815] 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/179815">179815</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-08 18:38:47 -0800 (Sun, 08 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Encapsulate DFG::Plan's beforeFTL timestamp
https://bugs.webkit.org/show_bug.cgi?id=141360
Reviewed by Darin Adler.
Make the attribute private, it is an internal state.
Rename beforeFTL->timeBeforeFTL for readability.
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThread):
(JSC::DFG::Plan::compileInThreadImpl):
* dfg/DFGPlan.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlanh">trunk/Source/JavaScriptCore/dfg/DFGPlan.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179814 => 179815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-02-09 02:37:03 UTC (rev 179814)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-02-09 02:38:47 UTC (rev 179815)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-08 Benjamin Poulain <benjamin@webkit.org>
+
+ Encapsulate DFG::Plan's beforeFTL timestamp
+ https://bugs.webkit.org/show_bug.cgi?id=141360
+
+ Reviewed by Darin Adler.
+
+ Make the attribute private, it is an internal state.
+
+ Rename beforeFTL->timeBeforeFTL for readability.
+
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThread):
+ (JSC::DFG::Plan::compileInThreadImpl):
+ * dfg/DFGPlan.h:
+
</ins><span class="cx"> 2015-02-08 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove DFGNode::hasArithNodeFlags()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (179814 => 179815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp        2015-02-09 02:37:03 UTC (rev 179814)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp        2015-02-09 02:38:47 UTC (rev 179815)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> double before = 0;
</span><span class="cx"> CString codeBlockName;
</span><span class="cx"> if (reportCompileTimes()) {
</span><del>- before = currentTimeMS();
</del><ins>+ before = monotonicallyIncreasingTime();
</ins><span class="cx"> codeBlockName = toCString(*codeBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,10 +188,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- double now = currentTimeMS();
</del><ins>+ double now = monotonicallyIncreasingTime();
</ins><span class="cx"> dataLog("Optimized ", codeBlockName, " using ", mode, " with ", pathName, " into ", finalizer ? finalizer->codeSize() : 0, " bytes in ", now - before, " ms");
</span><span class="cx"> if (path == FTLPath)
</span><del>- dataLog(" (DFG: ", beforeFTL - before, ", LLVM: ", now - beforeFTL, ")");
</del><ins>+ dataLog(" (DFG: ", m_timeBeforeFTL - before, ", LLVM: ", now - m_timeBeforeFTL, ")");
</ins><span class="cx"> dataLog(".\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> FTL::lowerDFGToLLVM(state);
</span><span class="cx">
</span><span class="cx"> if (reportCompileTimes())
</span><del>- beforeFTL = currentTimeMS();
</del><ins>+ m_timeBeforeFTL = monotonicallyIncreasingTime();
</ins><span class="cx">
</span><span class="cx"> if (Options::llvmAlwaysFailsBeforeCompile()) {
</span><span class="cx"> FTL::fail(state);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.h (179814 => 179815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.h        2015-02-09 02:37:03 UTC (rev 179814)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.h        2015-02-09 02:38:47 UTC (rev 179815)
</span><span class="lines">@@ -97,8 +97,6 @@
</span><span class="cx">
</span><span class="cx"> bool willTryToTierUp;
</span><span class="cx">
</span><del>- double beforeFTL;
-
</del><span class="cx"> enum Stage { Preparing, Compiling, Compiled, Ready, Cancelled };
</span><span class="cx"> Stage stage;
</span><span class="cx">
</span><span class="lines">@@ -112,6 +110,8 @@
</span><span class="cx">
</span><span class="cx"> bool isStillValid();
</span><span class="cx"> void reallyAdd(CommonData*);
</span><ins>+
+ double m_timeBeforeFTL;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #else // ENABLE(DFG_JIT)
</span></span></pre>
</div>
</div>
</body>
</html>