<!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>[182770] 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/182770">182770</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-04-13 17:08:29 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>build.webkit.org/dashboard shows obsolete results when builds are substantially out of order
https://bugs.webkit.org/show_bug.cgi?id=138630
Reviewed by Tim Horton.
Make sure that we always load at least one in order productive iteration.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue): Added _hasLoadedIterationForInOrderResult to track whether the queue
is done loading at least one iteration that wasn't an out of order build.
(BuildbotQueue.prototype.loadMoreHistoricalIterations): Listen for iteration load
when that's needed to check for out of order builds.
(BuildbotQueue.prototype.update): Ditto.
(BuildbotQueue.prototype._checkForInOrderResult): Check if the queue has an in order
result, and if it does not, load more iterations.
(BuildbotQueue.prototype.loadAll): We have everything loaded, so we certainly have
an in order iteration loaded too.
(BuildbotQueue.prototype.compareIterations): Extracted from sortIterations(), and
corrected to always sort loaded iterations before unloaded ones.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (182769 => 182770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-04-14 00:07:35 UTC (rev 182769)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-04-14 00:08:29 UTC (rev 182770)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx">
</span><span class="cx"> this.iterations = [];
</span><span class="cx"> this._knownIterations = {};
</span><ins>+
+ // Some queues process changes out of order, but we need to display results for the latest commit,
+ // not the latest build. BuildbotQueue ensures that at least one productive iteration
+ // that was run in order gets loaded (if the queue had any productive iterations, of course).
+ this._hasLoadedIterationForInOrderResult = false;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> BaseObject.addConstructorFunctions(BuildbotQueue);
</span><span class="lines">@@ -178,6 +183,8 @@
</span><span class="cx"> if (!iteration.loaded) {
</span><span class="cx"> if (indexOfFirstNewlyLoadingIteration === undefined)
</span><span class="cx"> indexOfFirstNewlyLoadingIteration = i;
</span><ins>+ if (!this._hasLoadedIterationForInOrderResult)
+ iteration.addEventListener(BuildbotIteration.Event.Updated, this._checkForInOrderResult.bind(this));
</ins><span class="cx"> iteration.update();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -206,8 +213,11 @@
</span><span class="cx"> this._knownIterations[iteration.id] = iteration;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (i >= loadingStop && (!iteration.finished || !iteration.loaded))
</del><ins>+ if (i >= loadingStop && (!iteration.finished || !iteration.loaded)) {
+ if (!this._hasLoadedIterationForInOrderResult)
+ iteration.addEventListener(BuildbotIteration.Event.Updated, this._checkForInOrderResult.bind(this));
</ins><span class="cx"> iteration.update();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!newIterations.length)
</span><span class="lines">@@ -219,6 +229,22 @@
</span><span class="cx"> }.bind(this));
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _checkForInOrderResult: function(event)
+ {
+ if (this._hasLoadedIterationForInOrderResult)
+ return;
+ var iterationsInOriginalOrder = this.iterations.concat().sort(function(a, b) { return b.id - a.id; });
+ for (var i = 0; i < iterationsInOriginalOrder.length - 1; ++i) {
+ var i1 = iterationsInOriginalOrder[i];
+ var i2 = iterationsInOriginalOrder[i + 1];
+ if (i1.productive && i2.loaded && this.compareIterations(i1, i2) < 0) {
+ this._hasLoadedIterationForInOrderResult = true;
+ return;
+ }
+ }
+ this.loadMoreHistoricalIterations();
+ },
+
</ins><span class="cx"> loadAll: function(callback)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Don't load everything at once, do it incrementally as requested.
</span><span class="lines">@@ -232,25 +258,32 @@
</span><span class="cx">
</span><span class="cx"> this.sortIterations();
</span><span class="cx">
</span><ins>+ this._hasLoadedIterationForInOrderResult = true;
+
</ins><span class="cx"> callback(this);
</span><span class="cx"> }.bind(this));
</span><span class="cx"> },
</span><span class="cx">
</span><del>- sortIterations: function()
</del><ins>+ compareIterations: function(a, b)
</ins><span class="cx"> {
</span><del>- function compareIterations(a, b)
- {
- var result = b.openSourceRevision - a.openSourceRevision;
- if (result)
- return result;
</del><ins>+ var result = b.openSourceRevision - a.openSourceRevision;
+ if (result)
+ return result;
</ins><span class="cx">
</span><del>- result = b.internalRevision - a.internalRevision;
- if (result)
- return result;
</del><ins>+ result = b.internalRevision - a.internalRevision;
+ if (result)
+ return result;
</ins><span class="cx">
</span><del>- return b.id - a.id;
- }
</del><ins>+ // A loaded iteration may not have revision numbers if it failed early, before svn steps finished.
+ result = b.loaded - a.loaded;
+ if (result)
+ return result;
</ins><span class="cx">
</span><del>- this.iterations.sort(compareIterations);
</del><ins>+ return b.id - a.id;
+ },
+
+ sortIterations: function()
+ {
+ this.iterations.sort(this.compareIterations);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182769 => 182770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-14 00:07:35 UTC (rev 182769)
+++ trunk/Tools/ChangeLog 2015-04-14 00:08:29 UTC (rev 182770)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-04-13 Alexey Proskuryakov <ap@apple.com>
+
+ build.webkit.org/dashboard shows obsolete results when builds are substantially out of order
+ https://bugs.webkit.org/show_bug.cgi?id=138630
+
+ Reviewed by Tim Horton.
+
+ Make sure that we always load at least one in order productive iteration.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue): Added _hasLoadedIterationForInOrderResult to track whether the queue
+ is done loading at least one iteration that wasn't an out of order build.
+ (BuildbotQueue.prototype.loadMoreHistoricalIterations): Listen for iteration load
+ when that's needed to check for out of order builds.
+ (BuildbotQueue.prototype.update): Ditto.
+ (BuildbotQueue.prototype._checkForInOrderResult): Check if the queue has an in order
+ result, and if it does not, load more iterations.
+ (BuildbotQueue.prototype.loadAll): We have everything loaded, so we certainly have
+ an in order iteration loaded too.
+ (BuildbotQueue.prototype.compareIterations): Extracted from sortIterations(), and
+ corrected to always sort loaded iterations before unloaded ones.
+
</ins><span class="cx"> 2015-04-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Expand test infrastructure to support scrolling tests
</span></span></pre>
</div>
</div>
</body>
</html>