<!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>[193636] 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/193636">193636</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 10:30:53 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename Watchdog::didFire to Watchdog::shouldTerminate because that's what didFire really meant
https://bugs.webkit.org/show_bug.cgi?id=151944
Reviewed by Mark Lam.
* interpreter/Interpreter.cpp:
(JSC::Interpreter::execute):
* runtime/VMInlines.h:
(JSC::VM::shouldTriggerTermination):
* runtime/Watchdog.cpp:
(JSC::Watchdog::terminateSoon):
(JSC::Watchdog::shouldTerminateSlow):
(JSC::Watchdog::didFireSlow): Deleted.
* runtime/Watchdog.h:
(JSC::Watchdog::shouldTerminate):
(JSC::Watchdog::didFire): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMInlinesh">trunk/Source/JavaScriptCore/runtime/VMInlines.h</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 (193635 => 193636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-07 18:15:09 UTC (rev 193635)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-07 18:30:53 UTC (rev 193636)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-07 Saam barati <sbarati@apple.com>
+
+ Rename Watchdog::didFire to Watchdog::shouldTerminate because that's what didFire really meant
+ https://bugs.webkit.org/show_bug.cgi?id=151944
+
+ Reviewed by Mark Lam.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::execute):
+ * runtime/VMInlines.h:
+ (JSC::VM::shouldTriggerTermination):
+ * runtime/Watchdog.cpp:
+ (JSC::Watchdog::terminateSoon):
+ (JSC::Watchdog::shouldTerminateSlow):
+ (JSC::Watchdog::didFireSlow): Deleted.
+ * runtime/Watchdog.h:
+ (JSC::Watchdog::shouldTerminate):
+ (JSC::Watchdog::didFire): Deleted.
+
</ins><span class="cx"> 2015-12-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename JITBitwiseBinaryOpGenerator to JITBitBinaryOpGenerator.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (193635 => 193636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-12-07 18:15:09 UTC (rev 193635)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-12-07 18:30:53 UTC (rev 193636)
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx"> return checkedReturn(callFrame->vm().throwException(callFrame, compileError));
</span><span class="cx"> ModuleProgramCodeBlock* codeBlock = executable->codeBlock();
</span><span class="cx">
</span><del>- if (UNLIKELY(vm.watchdog && vm.watchdog->didFire(callFrame)))
</del><ins>+ if (UNLIKELY(vm.shouldTriggerTermination(callFrame)))
</ins><span class="cx"> return throwTerminatedExecutionException(callFrame);
</span><span class="cx">
</span><span class="cx"> ASSERT(codeBlock->numParameters() == 1); // 1 parameter for 'this'.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMInlines.h (193635 => 193636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMInlines.h 2015-12-07 18:15:09 UTC (rev 193635)
+++ trunk/Source/JavaScriptCore/runtime/VMInlines.h 2015-12-07 18:30:53 UTC (rev 193636)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!watchdog)
</span><span class="cx"> return false;
</span><del>- return watchdog->didFire(exec);
</del><ins>+ return watchdog->shouldTerminate(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.cpp (193635 => 193636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-12-07 18:15:09 UTC (rev 193635)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-12-07 18:30:53 UTC (rev 193636)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> m_timerDidFire = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Watchdog::didFireSlow(ExecState* exec)
</del><ins>+bool Watchdog::shouldTerminateSlow(ExecState* exec)
</ins><span class="cx"> {
</span><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_lock);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.h (193635 => 193636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.h 2015-12-07 18:15:09 UTC (rev 193635)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.h 2015-12-07 18:30:53 UTC (rev 193636)
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx"> void setTimeLimit(std::chrono::microseconds limit, ShouldTerminateCallback = 0, void* data1 = 0, void* data2 = 0);
</span><span class="cx"> JS_EXPORT_PRIVATE void terminateSoon();
</span><span class="cx">
</span><del>- bool didFire(ExecState* exec)
</del><ins>+ bool shouldTerminate(ExecState* exec)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_timerDidFire)
</span><span class="cx"> return false;
</span><del>- return didFireSlow(exec);
</del><ins>+ return shouldTerminateSlow(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasTimeLimit();
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void startTimer(LockHolder&, std::chrono::microseconds timeLimit);
</span><span class="cx"> void stopTimer(LockHolder&);
</span><span class="cx">
</span><del>- bool didFireSlow(ExecState*);
</del><ins>+ bool shouldTerminateSlow(ExecState*);
</ins><span class="cx">
</span><span class="cx"> // m_timerDidFire indicates whether the timer fired. The Watchdog
</span><span class="cx"> // still needs to check if the allowed CPU time has elapsed. If so, then
</span></span></pre>
</div>
</div>
</body>
</html>