<!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>[194679] trunk/Websites/perf.webkit.org</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/194679">194679</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-06 16:57:07 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Perf dashboard should auto-generate manifest file when one is missing
https://bugs.webkit.org/show_bug.cgi?id=152813
Reviewed by Chris Dumez.
When /data/manifest.json is missing, fall back to newly added /api/manifest instead of
silently failing to show the UI. This will make the initial setup easier.
* public/api/manifest.php: Added.
(main):
* public/include/manifest.php:
(Manifest::manifest): Added.
* public/v3/main.js:
(fetchManifest):
(didFetchManifest): Extracted from fetchManifest.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludemanifestphp">trunk/Websites/perf.webkit.org/public/include/manifest.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3mainjs">trunk/Websites/perf.webkit.org/public/v3/main.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgpublicapimanifestphp">trunk/Websites/perf.webkit.org/public/api/manifest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (194678 => 194679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-01-06 23:54:26 UTC (rev 194678)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-01-07 00:57:07 UTC (rev 194679)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-01-06 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Perf dashboard should auto-generate manifest file when one is missing
+ https://bugs.webkit.org/show_bug.cgi?id=152813
+
+ Reviewed by Chris Dumez.
+
+ When /data/manifest.json is missing, fall back to newly added /api/manifest instead of
+ silently failing to show the UI. This will make the initial setup easier.
+
+ * public/api/manifest.php: Added.
+ (main):
+ * public/include/manifest.php:
+ (Manifest::manifest): Added.
+ * public/v3/main.js:
+ (fetchManifest):
+ (didFetchManifest): Extracted from fetchManifest.
+
+2016-01-06 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Commit another forgotten change, this time, for r194653.
</span><span class="cx">
</span><span class="cx"> * public/v3/models/measurement-set.js:
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapimanifestphp"></a>
<div class="addfile"><h4>Added: trunk/Websites/perf.webkit.org/public/api/manifest.php (0 => 194679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/manifest.php (rev 0)
+++ trunk/Websites/perf.webkit.org/public/api/manifest.php 2016-01-07 00:57:07 UTC (rev 194679)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?php
+
+require_once('../include/json-header.php');
+require_once('../include/manifest.php');
+
+function main() {
+ $db = new Database;
+ if (!$db->connect())
+ exit_with_error('DatabaseConnectionFailure');
+
+ $generator = new ManifestGenerator($db);
+ if (!$generator->generate())
+ exit_with_error('FailedToGenerateManifest');
+
+ if (!$generator->store())
+ exit_with_error('FailedToStoreManifest');
+
+ exit_with_success($generator->manifest());
+}
+
+main();
+
+?>
</ins></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludemanifestphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/manifest.php (194678 => 194679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/manifest.php 2016-01-06 23:54:26 UTC (rev 194678)
+++ trunk/Websites/perf.webkit.org/public/include/manifest.php 2016-01-07 00:57:07 UTC (rev 194679)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function manifest() { return $this->manifest; }
+
</ins><span class="cx"> function store() {
</span><span class="cx"> return generate_data_file('manifest.json', json_encode($this->manifest));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3mainjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/main.js (194678 => 194679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/main.js 2016-01-06 23:54:26 UTC (rev 194678)
+++ trunk/Websites/perf.webkit.org/public/v3/main.js 2016-01-07 00:57:07 UTC (rev 194679)
</span><span class="lines">@@ -56,54 +56,59 @@
</span><span class="cx">
</span><span class="cx"> function fetchManifest()
</span><span class="cx"> {
</span><del>- var manifestURL = '../data/manifest.json';
</del><ins>+ return getJSON('../data/manifest.json').then(didFetchManifest, function () {
+ return getJSON('../api/manifest/').then(didFetchManifest, function (error) {
+ alert('Failed to load the site manifest: ' + error);
+ });
+ });
+}
</ins><span class="cx">
</span><del>- return getJSON(manifestURL).then(function (rawResponse) {
- Instrumentation.startMeasuringTime('Manifest', 'constructor');
</del><ins>+function didFetchManifest(rawResponse)
+{
+ Instrumentation.startMeasuringTime('Main', 'didFetchManifest');
</ins><span class="cx">
</span><del>- var tests = [];
- var testParentMap = {};
- for (var testId in rawResponse.tests) {
- var test = rawResponse.tests[testId];
- var topLevel = !test.parentId;
- if (test.parentId)
- testParentMap[testId] = parseInt(test.parentId);
- tests.push(new Test(testId, test, topLevel));
- }
- for (var testId in testParentMap)
- Test.findById(testId).setParentTest(Test.findById(testParentMap[testId]));
</del><ins>+ var tests = [];
+ var testParentMap = {};
+ for (var testId in rawResponse.tests) {
+ var test = rawResponse.tests[testId];
+ var topLevel = !test.parentId;
+ if (test.parentId)
+ testParentMap[testId] = parseInt(test.parentId);
+ tests.push(new Test(testId, test, topLevel));
+ }
+ for (var testId in testParentMap)
+ Test.findById(testId).setParentTest(Test.findById(testParentMap[testId]));
</ins><span class="cx">
</span><del>- function buildObjectsFromIdMap(idMap, constructor, resolver) {
- for (var id in idMap) {
- if (resolver)
- resolver(idMap[id]);
- new constructor(id, idMap[id]);
- }
</del><ins>+ function buildObjectsFromIdMap(idMap, constructor, resolver) {
+ for (var id in idMap) {
+ if (resolver)
+ resolver(idMap[id]);
+ new constructor(id, idMap[id]);
</ins><span class="cx"> }
</span><del>- buildObjectsFromIdMap(rawResponse.metrics, Metric, function (raw) {
- raw.test = Test.findById(raw.test);
- });
</del><ins>+ }
+ buildObjectsFromIdMap(rawResponse.metrics, Metric, function (raw) {
+ raw.test = Test.findById(raw.test);
+ });
</ins><span class="cx">
</span><del>- buildObjectsFromIdMap(rawResponse.all, Platform, function (raw) {
- raw.lastModifiedByMetric = {};
- raw.lastModified.forEach(function (lastModified, index) {
- raw.lastModifiedByMetric[raw.metrics[index]] = lastModified;
- });
- raw.metrics = raw.metrics.map(function (id) { return Metric.findById(id); });
</del><ins>+ buildObjectsFromIdMap(rawResponse.all, Platform, function (raw) {
+ raw.lastModifiedByMetric = {};
+ raw.lastModified.forEach(function (lastModified, index) {
+ raw.lastModifiedByMetric[raw.metrics[index]] = lastModified;
</ins><span class="cx"> });
</span><del>- buildObjectsFromIdMap(rawResponse.builders, Builder);
- buildObjectsFromIdMap(rawResponse.repositories, Repository);
- buildObjectsFromIdMap(rawResponse.bugTrackers, BugTracker, function (raw) {
- raw.repositories = raw.repositories.map(function (id) { return Repository.findById(id); });
- });
</del><ins>+ raw.metrics = raw.metrics.map(function (id) { return Metric.findById(id); });
+ });
+ buildObjectsFromIdMap(rawResponse.builders, Builder);
+ buildObjectsFromIdMap(rawResponse.repositories, Repository);
+ buildObjectsFromIdMap(rawResponse.bugTrackers, BugTracker, function (raw) {
+ raw.repositories = raw.repositories.map(function (id) { return Repository.findById(id); });
+ });
</ins><span class="cx">
</span><del>- Instrumentation.endMeasuringTime('Manifest', 'constructor');
</del><ins>+ Instrumentation.endMeasuringTime('Main', 'didFetchManifest');
</ins><span class="cx">
</span><del>- return {
- siteTitle: rawResponse.siteTitle,
- dashboards: rawResponse.dashboards, // FIXME: Add an abstraction around dashboards.
- }
- });
</del><ins>+ return {
+ siteTitle: rawResponse.siteTitle,
+ dashboards: rawResponse.dashboards, // FIXME: Add an abstraction around dashboards.
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (document.readyState != 'loading')
</span></span></pre>
</div>
</div>
</body>
</html>