Perf-o-matic should show both WebKit and Chromium revisions

https://bugs.webkit.org/show_bug.cgi?id=78955

Reviewed by Andreas Kling.

Include Chromium revision numbers in runs responses when available.

* Websites/webkit-perf.appspot.com/js/config.js:
(urlForChangeset):
(urlForChangesetList):
* Websites/webkit-perf.appspot.com/runs_handler.py:
(RunsHandler.post):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 7d53249..cfe5657 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-02-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Perf-o-matic should show both WebKit and Chromium revisions
+        https://bugs.webkit.org/show_bug.cgi?id=78955
+
+        Reviewed by Andreas Kling.
+
+        Include Chromium revision numbers in runs responses when available.
+
+        * Websites/webkit-perf.appspot.com/js/config.js:
+        (urlForChangeset):
+        (urlForChangesetList):
+        * Websites/webkit-perf.appspot.com/runs_handler.py:
+        (RunsHandler.post):
+
 2012-02-18  Kevin Ollivier  <kevino@theolliviers.com>
 
         [wx] Exclude a couple unused bindings files from the build

diff --git a/Websites/webkit-perf.appspot.com/js/config.js b/Websites/webkit-perf.appspot.com/js/config.js
index 6a87ef6..e1f7c56 100644 (file)
--- a/Websites/webkit-perf.appspot.com/js/config.js
+++ b/Websites/webkit-perf.appspot.com/js/config.js
@@ -54,16 +54,29 @@ var OVERVIEW_OPTIONS = {
     }
 };
 
-function urlForChangeset(branch, changeset)
+var REPOSITORIES = ['WebKit', 'Chromium'];
+var DEFAULT_REPOSITORY = 'WebKit';
+
+function urlForChangeset(branch, changeset, repository)
 {
-    return 'http://trac.webkit.org/changeset/' + changeset;
+    if (repository == 'Chromium')
+        return 'http://src.chromium.org/viewvc/chrome?view=rev&revision=' +
+               changeset;
+    else
+        return 'http://trac.webkit.org/changeset/' + changeset;
 }
 
-function urlForChangesetList(branch, changesetList)
+function urlForChangesetList(branch, changesetList, repository)
 {
     var min = Math.min.apply(Math, changesetList);
     var max = Math.max.apply(Math, changesetList);
-    return 'http://trac.webkit.org/log/?rev=' + max + '&stop_rev=' + min + '&verbose=on';
+    if (repository == 'Chromium')
+        return 'http://build.chromium.org/f/chromium/perf/dashboard/ui/' +
+               'changelog.html?url=/trunk/src&mode=html&range=' + min + ':' +
+               max;
+    else
+        return 'http://trac.webkit.org/log/?rev=' + max + '&stop_rev=' + min +
+               '&verbose=on';
 }
 
 // FIXME move this back to dashboard.js once the bug 718925 is fixed

diff --git a/Websites/webkit-perf.appspot.com/runs_handler.py b/Websites/webkit-perf.appspot.com/runs_handler.py
index 396a69b..280ae2f 100644 (file)
--- a/Websites/webkit-perf.appspot.com/runs_handler.py
+++ b/Websites/webkit-perf.appspot.com/runs_handler.py
@@ -80,13 +80,18 @@ class RunsHandler(webapp2.RequestHandler):
                 builderId = build.builder.key().id()
                 posixTimestamp = mktime(build.timestamp.timetuple())
                 statistics = None
+                supplementary_revisions = None
                 if result.valueStdev != None and result.valueMin != None and result.valueMax != None:
                     statistics = {'stdev': result.valueStdev, 'min': result.valueMin, 'max': result.valueMax}
+                if build.chromiumRevision != None:
+                    supplementary_revisions = {'Chromium': build.chromiumRevision}
+
                 test_runs.append([result.key().id(),
-                    [build.key().id(), build.buildNumber, build.revision],
+                    [build.key().id(), build.buildNumber, build.revision, supplementary_revisions],
                     posixTimestamp, result.value, 0,  # runNumber
                     [],  # annotations
                     builderId, statistics])
+
                 # FIXME: Calculate the average; in practice, we wouldn't have more than one value for a given revision
                 averages[build.revision] = result.value
                 values.append(result.value)