<!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>[188147] 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/188147">188147</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 12:34:13 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename some variables in the JSC watchdog implementation.
https://bugs.webkit.org/show_bug.cgi?id=147790
Rubber stamped by Benjamin Poulain.
This is just a refactoring patch to give the variable better names that describe their
intended use. There is no behavior change.
* runtime/Watchdog.cpp:
(JSC::Watchdog::Watchdog):
(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::didFire):
(JSC::Watchdog::isEnabled):
(JSC::Watchdog::fire):
(JSC::Watchdog::startCountdownIfNeeded):
* runtime/Watchdog.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWatchdogcpp">trunk/Source/JavaScriptCore/runtime/Watchdog.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWatchdogh">trunk/Source/JavaScriptCore/runtime/Watchdog.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188146 => 188147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-07 19:09:59 UTC (rev 188146)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-07 19:34:13 UTC (rev 188147)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-08-07 Mark Lam <mark.lam@apple.com>
+
+ Rename some variables in the JSC watchdog implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=147790
+
+ Rubber stamped by Benjamin Poulain.
+
+ This is just a refactoring patch to give the variable better names that describe their
+ intended use. There is no behavior change.
+
+ * runtime/Watchdog.cpp:
+ (JSC::Watchdog::Watchdog):
+ (JSC::Watchdog::setTimeLimit):
+ (JSC::Watchdog::didFire):
+ (JSC::Watchdog::isEnabled):
+ (JSC::Watchdog::fire):
+ (JSC::Watchdog::startCountdownIfNeeded):
+ * runtime/Watchdog.h:
+
</ins><span class="cx"> 2015-08-07 Saam barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> Interpreter::unwind shouldn't be responsible for assigning the correct scope.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.cpp (188146 => 188147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-08-07 19:09:59 UTC (rev 188146)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-08-07 19:34:13 UTC (rev 188147)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> Watchdog::Watchdog()
</span><span class="cx"> : m_timerDidFire(false)
</span><span class="cx"> , m_didFire(false)
</span><del>- , m_limit(NO_LIMIT)
- , m_startTime(0)
- , m_elapsedTime(0)
</del><ins>+ , m_timeoutPeriod(NO_LIMIT)
+ , m_startCPUTime(0)
+ , m_elapsedCPUTime(0)
</ins><span class="cx"> , m_reentryCount(0)
</span><span class="cx"> , m_isStopped(true)
</span><span class="cx"> , m_callback(0)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> m_didFire = false; // Reset the watchdog.
</span><span class="cx">
</span><del>- m_limit = limit;
</del><ins>+ m_timeoutPeriod = limit;
</ins><span class="cx"> m_callback = callback;
</span><span class="cx"> m_callbackData1 = data1;
</span><span class="cx"> m_callbackData2 = data2;
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> stopCountdown();
</span><span class="cx">
</span><span class="cx"> auto currentTime = currentCPUTime();
</span><del>- auto deltaTime = currentTime - m_startTime;
- auto totalElapsedTime = m_elapsedTime + deltaTime;
- if (totalElapsedTime > m_limit) {
</del><ins>+ auto deltaCPUTime = currentTime - m_startCPUTime;
+ auto totalElapsedCPUTime = m_elapsedCPUTime + deltaCPUTime;
+ if (totalElapsedCPUTime > m_timeoutPeriod) {
</ins><span class="cx"> // Case 1: the allowed CPU time has elapsed.
</span><span class="cx">
</span><span class="cx"> // If m_callback is not set, then we terminate by default.
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx">
</span><span class="cx"> // Tell the timer to alarm us again when it thinks we've reached the
</span><span class="cx"> // end of the allowed time.
</span><del>- auto remainingTime = m_limit - totalElapsedTime;
- m_elapsedTime = totalElapsedTime;
- m_startTime = currentTime;
- startCountdown(remainingTime);
</del><ins>+ auto remainingCPUTime = m_timeoutPeriod - totalElapsedCPUTime;
+ m_elapsedCPUTime = totalElapsedCPUTime;
+ m_startCPUTime = currentTime;
+ startCountdown(remainingCPUTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> bool Watchdog::isEnabled()
</span><span class="cx"> {
</span><del>- return (m_limit != NO_LIMIT);
</del><ins>+ return (m_timeoutPeriod != NO_LIMIT);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Watchdog::fire()
</span><span class="lines">@@ -164,9 +164,9 @@
</span><span class="cx"> return; // Not executing JS script. No need to start.
</span><span class="cx">
</span><span class="cx"> if (isEnabled()) {
</span><del>- m_elapsedTime = std::chrono::microseconds::zero();
- m_startTime = currentCPUTime();
- startCountdown(m_limit);
</del><ins>+ m_elapsedCPUTime = std::chrono::microseconds::zero();
+ m_startCPUTime = currentCPUTime();
+ startCountdown(m_timeoutPeriod);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.h (188146 => 188147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.h 2015-08-07 19:09:59 UTC (rev 188146)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.h 2015-08-07 19:34:13 UTC (rev 188147)
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> bool m_timerDidFire;
</span><span class="cx"> bool m_didFire;
</span><span class="cx">
</span><del>- std::chrono::microseconds m_limit;
- std::chrono::microseconds m_startTime;
- std::chrono::microseconds m_elapsedTime;
</del><ins>+ std::chrono::microseconds m_timeoutPeriod;
+ std::chrono::microseconds m_startCPUTime;
+ std::chrono::microseconds m_elapsedCPUTime;
</ins><span class="cx">
</span><span class="cx"> int m_reentryCount;
</span><span class="cx"> bool m_isStopped;
</span></span></pre>
</div>
</div>
</body>
</html>