<!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>[188172] 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/188172">188172</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-07 16:10:59 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor BuildbotQueue.compareIterations and BuildbotQueue.compareIterationsByRevisions to be more generic
https://bugs.webkit.org/show_bug.cgi?id=147667
Patch by Jason Marcell <jmarcell@apple.com> on 2015-08-07
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue.prototype.compareIterations): Refactored to work more generically with repositories
other than "openSource" and "internal".
(BuildbotQueue.prototype.compareIterationsByRevisions): Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
(Dashboard.get sortedPlatforms): Added. Returns a sorted array of platforms.
(Dashboard.get sortedRepositories): Added. Returns a sorted array of repositories.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady): Using Dashboard.sortedPlatforms instead of sortedPlatforms.
(sortedPlatforms): Deleted.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
(buildQueuesTable): Using Dashboard.sortedPlatforms instead of sortedPlatforms.
(sortedPlatforms): Deleted.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
(sortDictionariesByOrder): Added. Takes an array of dictionaries that have an "order" property
and sorts them by this property returning the new sorted array.</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="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsDashboardjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMetricsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.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 (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -268,14 +268,14 @@
</span><span class="cx">
</span><span class="cx"> compareIterations: function(a, b)
</span><span class="cx"> {
</span><del>- var result = b.revision[Dashboard.Repository.OpenSource.name] - a.revision[Dashboard.Repository.OpenSource.name];
- if (result)
- return result;
</del><ins>+ var sortedRepositories = Dashboard.sortedRepositories;
+ for (var i = 0; i < sortedRepositories.length; ++i) {
+ var repositoryName = sortedRepositories[i].name;
+ var result = b.revision[repositoryName] - a.revision[repositoryName];
+ if (result)
+ return result;
+ }
</ins><span class="cx">
</span><del>- result = b.revision[Dashboard.Repository.Internal.name] - a.revision[Dashboard.Repository.Internal.name];
- if (result)
- return result;
-
</del><span class="cx"> // A loaded iteration may not have revision numbers if it failed early, before svn steps finished.
</span><span class="cx"> result = b.loaded - a.loaded;
</span><span class="cx"> if (result)
</span><span class="lines">@@ -286,14 +286,14 @@
</span><span class="cx">
</span><span class="cx"> compareIterationsByRevisions: function(a, b)
</span><span class="cx"> {
</span><del>- var result = b.revision[Dashboard.Repository.OpenSource.name] - a.revision[Dashboard.Repository.OpenSource.name];
- if (result)
- return result;
</del><ins>+ var sortedRepositories = Dashboard.sortedRepositories;
+ for (var i = 0; i < sortedRepositories.length; ++i) {
+ var repositoryName = sortedRepositories[i].name;
+ var result = b.revision[repositoryName] - a.revision[repositoryName];
+ if (result)
+ return result;
+ }
</ins><span class="cx">
</span><del>- result = b.revision[Dashboard.Repository.Internal.name] - a.revision[Dashboard.Repository.Internal.name];
- if (result)
- return result;
-
</del><span class="cx"> return 0;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -39,5 +39,17 @@
</span><span class="cx"> Repository: {
</span><span class="cx"> OpenSource: { name: "openSource", order: 0 },
</span><span class="cx"> Internal: { name: "internal", order: 1 },
</span><del>- }
</del><ins>+ },
+ get sortedPlatforms()
+ {
+ if (!this._sortedPlatforms)
+ this._sortedPlatforms = sortDictionariesByOrder(Dashboard.Platform);
+ return this._sortedPlatforms;
+ },
+ get sortedRepositories()
+ {
+ if (!this._sortedRepositories)
+ this._sortedRepositories = sortDictionariesByOrder(Dashboard.Repository);
+ return this._sortedRepositories;
+ },
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -103,20 +103,6 @@
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
</span><span class="cx">
</span><del>-function sortedPlatforms()
-{
- var platforms = [];
-
- for (var platformKey in Dashboard.Platform)
- platforms.push(Dashboard.Platform[platformKey]);
-
- platforms.sort(function(a, b) {
- return a.order - b.order;
- });
-
- return platforms;
-}
-
</del><span class="cx"> function updateHiddenPlatforms()
</span><span class="cx"> {
</span><span class="cx"> var hiddenPlatforms = settings.getObject("hiddenPlatforms");
</span><span class="lines">@@ -199,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> table.appendChild(row);
</span><span class="cx">
</span><del>- var platforms = sortedPlatforms();
</del><ins>+ var platforms = Dashboard.sortedPlatforms;
</ins><span class="cx">
</span><span class="cx"> for (var i in platforms) {
</span><span class="cx"> var platform = platforms[i];
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMetricsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -70,20 +70,6 @@
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
</span><span class="cx">
</span><del>-function sortedPlatforms()
-{
- var platforms = [];
-
- for (var platformKey in Dashboard.Platform)
- platforms.push(Dashboard.Platform[platformKey]);
-
- platforms.sort(function(a, b) {
- return a.order - b.order;
- });
-
- return platforms;
-}
-
</del><span class="cx"> function updateHiddenPlatforms()
</span><span class="cx"> {
</span><span class="cx"> var hiddenPlatforms = settings.getObject("hiddenPlatforms");
</span><span class="lines">@@ -204,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> table.appendChild(row);
</span><span class="cx">
</span><del>- var platforms = sortedPlatforms();
</del><ins>+ var platforms = Dashboard.sortedPlatforms;
</ins><span class="cx">
</span><span class="cx"> for (var i in platforms) {
</span><span class="cx"> var platform = platforms[i];
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -196,4 +196,18 @@
</span><span class="cx"> String.prototype.startsWith = function(substring)
</span><span class="cx"> {
</span><span class="cx"> return this.lastIndexOf(substring, 0) === 0;
</span><del>-}
</del><ins>+};
+
+function sortDictionariesByOrder(unsorted)
+{
+ var sorted = [];
+
+ for (var key in unsorted)
+ sorted.push(unsorted[key]);
+
+ sorted.sort(function(a, b) {
+ return a.order - b.order;
+ });
+
+ return sorted;
+};
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188171 => 188172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-07 23:07:22 UTC (rev 188171)
+++ trunk/Tools/ChangeLog 2015-08-07 23:10:59 UTC (rev 188172)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-08-07 Jason Marcell <jmarcell@apple.com>
+
+ Refactor BuildbotQueue.compareIterations and BuildbotQueue.compareIterationsByRevisions to be more generic
+ https://bugs.webkit.org/show_bug.cgi?id=147667
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue.prototype.compareIterations): Refactored to work more generically with repositories
+ other than "openSource" and "internal".
+ (BuildbotQueue.prototype.compareIterationsByRevisions): Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+ (Dashboard.get sortedPlatforms): Added. Returns a sorted array of platforms.
+ (Dashboard.get sortedRepositories): Added. Returns a sorted array of repositories.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+ (documentReady): Using Dashboard.sortedPlatforms instead of sortedPlatforms.
+ (sortedPlatforms): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
+ (buildQueuesTable): Using Dashboard.sortedPlatforms instead of sortedPlatforms.
+ (sortedPlatforms): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
+ (sortDictionariesByOrder): Added. Takes an array of dictionaries that have an "order" property
+ and sorts them by this property returning the new sorted array.
+
</ins><span class="cx"> 2015-08-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Lightweight locks should be adaptive
</span></span></pre>
</div>
</div>
</body>
</html>