<!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>[206596] trunk/Tools</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/206596">206596</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2016-09-29 11:44:54 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WKTR short timeout dynamic
https://bugs.webkit.org/show_bug.cgi?id=162733
Reviewed by Alex Christensen.
WebKitTestRunner has a hardcoded value for how long to wait for IPC responses,
which is 5 seconds, or 10 seconds under ASan. But some of the operations can be
fairly time consuming - e.g. launching Networking process on demand.
These may take longer under load, especially with GuardMalloc.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::reattachPageToWebProcess):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::shortTimeout):
(WTR::TestInvocation::invoke):
(WTR::TestInvocation::dumpResults):
* WebKitTestRunner/TestInvocation.h:
(WTR::TestInvocation::customTimeout): Deleted, this function was unused.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationh">trunk/Tools/WebKitTestRunner/TestInvocation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206595 => 206596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-29 18:44:53 UTC (rev 206595)
+++ trunk/Tools/ChangeLog 2016-09-29 18:44:54 UTC (rev 206596)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-09-29 Alexey Proskuryakov <ap@apple.com>
+
+ Make WKTR short timeout dynamic
+ https://bugs.webkit.org/show_bug.cgi?id=162733
+
+ Reviewed by Alex Christensen.
+
+ WebKitTestRunner has a hardcoded value for how long to wait for IPC responses,
+ which is 5 seconds, or 10 seconds under ASan. But some of the operations can be
+ fairly time consuming - e.g. launching Networking process on demand.
+ These may take longer under load, especially with GuardMalloc.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ (WTR::TestController::reattachPageToWebProcess):
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::shortTimeout):
+ (WTR::TestInvocation::invoke):
+ (WTR::TestInvocation::dumpResults):
+
+ * WebKitTestRunner/TestInvocation.h:
+ (WTR::TestInvocation::customTimeout): Deleted, this function was unused.
+
</ins><span class="cx"> 2016-09-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should fail to parse unclosed IPv6 addresses
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (206595 => 206596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-09-29 18:44:53 UTC (rev 206595)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-09-29 18:44:54 UTC (rev 206596)
</span><span class="lines">@@ -89,11 +89,7 @@
</span><span class="cx"> const unsigned TestController::w3cSVGViewWidth = 480;
</span><span class="cx"> const unsigned TestController::w3cSVGViewHeight = 360;
</span><span class="cx">
</span><del>-#if ASAN_ENABLED
-const double TestController::shortTimeout = 10.0;
-#else
-const double TestController::shortTimeout = 5.0;
-#endif
</del><ins>+const double TestController::defaultShortTimeout = 5.0;
</ins><span class="cx">
</span><span class="cx"> const double TestController::noTimeout = -1;
</span><span class="cx">
</span><span class="lines">@@ -797,7 +793,7 @@
</span><span class="cx"> setIgnoresViewportScaleLimits(options.ignoresViewportScaleLimits);
</span><span class="cx">
</span><span class="cx"> WKPageLoadURL(m_mainWebView->page(), blankURL());
</span><del>- runUntil(m_doneResetting, shortTimeout);
</del><ins>+ runUntil(m_doneResetting, m_currentInvocation->shortTimeout());
</ins><span class="cx"> return m_doneResetting;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -811,7 +807,7 @@
</span><span class="cx"> // Loading a web page is the only way to reattach an existing page to a process.
</span><span class="cx"> m_doneResetting = false;
</span><span class="cx"> WKPageLoadURL(m_mainWebView->page(), blankURL());
</span><del>- runUntil(m_doneResetting, shortTimeout);
</del><ins>+ runUntil(m_doneResetting, m_currentInvocation->shortTimeout());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* TestController::webProcessName()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (206595 => 206596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h 2016-09-29 18:44:53 UTC (rev 206595)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2016-09-29 18:44:54 UTC (rev 206596)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> static const unsigned w3cSVGViewWidth;
</span><span class="cx"> static const unsigned w3cSVGViewHeight;
</span><span class="cx">
</span><del>- static const double shortTimeout;
</del><ins>+ static const double defaultShortTimeout;
</ins><span class="cx"> static const double noTimeout;
</span><span class="cx">
</span><span class="cx"> TestController(int argc, const char* argv[]);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (206595 => 206596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-09-29 18:44:53 UTC (rev 206595)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-09-29 18:44:54 UTC (rev 206596)
</span><span class="lines">@@ -98,6 +98,20 @@
</span><span class="cx"> m_expectedPixelHash = expectedPixelHash;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double TestInvocation::shortTimeout() const
+{
+ if (!m_timeout) {
+ // Running WKTR directly, without webkitpy.
+ return TestController::defaultShortTimeout;
+ }
+
+ // This is not exactly correct for the way short timeout is used - it should not depend on whether a test is "slow",
+ // but it currently does. There is no way to know what a normal test's timeout is, as webkitpy only passes timeouts
+ // for each test individually.
+ // But there shouldn't be any observable negative consequences from this.
+ return m_timeout / 1000. / 2;
+}
+
</ins><span class="cx"> bool TestInvocation::shouldLogFrameLoadDelegates() const
</span><span class="cx"> {
</span><span class="cx"> return urlContains("loading/");
</span><span class="lines">@@ -149,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldOpenExternalURLs = false;
</span><span class="cx">
</span><del>- TestController::singleton().runUntil(m_gotInitialResponse, TestController::shortTimeout);
</del><ins>+ TestController::singleton().runUntil(m_gotInitialResponse, shortTimeout());
</ins><span class="cx"> if (!m_gotInitialResponse) {
</span><span class="cx"> m_errorMessage = "Timed out waiting for initial response from web process\n";
</span><span class="cx"> m_webProcessIsUnresponsive = true;
</span><span class="lines">@@ -253,7 +267,7 @@
</span><span class="cx"> else if (m_pixelResultIsPending) {
</span><span class="cx"> m_gotRepaint = false;
</span><span class="cx"> WKPageForceRepaint(TestController::singleton().mainWebView()->page(), this, TestInvocation::forceRepaintDoneCallback);
</span><del>- TestController::singleton().runUntil(m_gotRepaint, TestController::shortTimeout);
</del><ins>+ TestController::singleton().runUntil(m_gotRepaint, shortTimeout());
</ins><span class="cx"> if (!m_gotRepaint) {
</span><span class="cx"> m_errorMessage = "Timed out waiting for pre-pixel dump repaint\n";
</span><span class="cx"> m_webProcessIsUnresponsive = true;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.h (206595 => 206596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.h 2016-09-29 18:44:53 UTC (rev 206595)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.h 2016-09-29 18:44:54 UTC (rev 206596)
</span><span class="lines">@@ -49,9 +49,12 @@
</span><span class="cx">
</span><span class="cx"> void setIsPixelTest(const std::string& expectedPixelHash);
</span><span class="cx">
</span><ins>+ // Milliseconds
</ins><span class="cx"> void setCustomTimeout(int duration) { m_timeout = duration; }
</span><del>- int customTimeout() const { return m_timeout; }
</del><span class="cx">
</span><ins>+ // Seconds
+ double shortTimeout() const;
+
</ins><span class="cx"> void invoke();
</span><span class="cx"> void didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
</span><span class="cx"> WKRetainPtr<WKTypeRef> didReceiveSynchronousMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
</span></span></pre>
</div>
</div>
</body>
</html>