Skip to content

Commit

Permalink
Bug 1142680 - Merge all perf stuff (compare + graphs) into one app
Browse files Browse the repository at this point in the history
  • Loading branch information
@wlach
wlach committed Apr 21, 2015
1 parent 1edde1d commit a0c3f21
Show file tree
Hide file tree
Showing 10 changed files with 1,095 additions and 1,202 deletions.
44 changes: 2 additions & 42 deletions Gruntfile.js
View file
Expand Up @@ -51,17 +51,10 @@ module.exports = function(grunt) {
dest:'dist'
}
},
compareperf: {
src:'webapp/app/compareperf.html',
nonull: true,
options:{
dest:'dist'
}
},
},

usemin:{ html:['dist/index.html', 'dist/help.html', 'dist/logviewer.html',
'dist/perf.html', 'dist/compareperf.html'] },
'dist/perf.html'] },

'cache-busting': {
indexjs: {
Expand All @@ -82,12 +75,6 @@ module.exports = function(grunt) {
file: 'dist/js/perf.min.js',
cleanup: true
},
compareperfjs: {
replace: ['dist/**/*.html'],
replacement: 'compareperf2.min.js',
file: 'dist/js/compareperf2.min.js',
cleanup: true
},
indexcss: {
replace: ['dist/**/*.html'],
replacement: 'index.min.css',
Expand All @@ -106,12 +93,6 @@ module.exports = function(grunt) {
file: 'dist/css/perf.min.css',
cleanup: true
},
compareperfcss: {
replace: ['dist/**/*.html'],
replacement: 'compareperf.min.css',
file: 'dist/css/compareperf.min.css',
cleanup: true
},
helpcss: {
replace: ['dist/**/*.html'],
replacement: 'help.min.css',
Expand All @@ -127,8 +108,7 @@ module.exports = function(grunt) {
{ src:'webapp/app/index.html', dest:'dist/index.html', nonull: true },
{ src:'webapp/app/help.html', dest:'dist/help.html', nonull: true },
{ src:'webapp/app/logviewer.html', dest:'dist/logviewer.html', nonull: true },
{ src:'webapp/app/perf.html', dest:'dist/perf.html', nonull: true },
{ src:'webapp/app/compareperf.html', dest:'dist/compareperf.html', nonull: true }
{ src:'webapp/app/perf.html', dest:'dist/perf.html', nonull: true }
]
},
// Copy img dir
Expand Down Expand Up @@ -236,26 +216,6 @@ module.exports = function(grunt) {
keepClosingSlash: true
}
}
},
compareperf: {
cwd: 'webapp/app',
src: 'partials/perf/*.html',
dest: 'dist/js/compareperf2.min.js',
options: {
usemin: 'dist/js/compareperf2.min.js',
append: true,
htmlmin: {
collapseBooleanAttributes: true,
collapseWhitespace: true,
removeAttributeQuotes: true,
removeComments: true,
removeEmptyAttributes: true,
removeRedundantAttributes: true,
removeScriptTypeAttributes: true,
removeStyleLinkTypeAttributes: true,
keepClosingSlash: true
}
}
}
}
});
Expand Down
57 changes: 0 additions & 57 deletions ui/compareperf.html
View file

This file was deleted.

208 changes: 70 additions & 138 deletions ui/js/compareperf.js
View file
Expand Up @@ -34,50 +34,7 @@ function stddev(values, avg) {
// End Utility Functions
// -------------------------------------------------------------------------


var comparePerf = angular.module("compareperf", ['ui.router', 'ui.bootstrap', 'treeherder']);

//TODO: make getSeriesSummary part of a common library
comparePerf.factory('getSeriesSummary', [ function() {
return function(signature, signatureProps, optionCollectionMap, pgo, e10s) {
var platform = signatureProps.machine_platform + " " +
signatureProps.machine_architecture;
var extra = "";
if (signatureProps.job_group_symbol === "T-e10s") {
extra = " e10s";
}
var testName = signatureProps.test;
var subtestSignatures;
if (testName === undefined) {
testName = "summary";
subtestSignatures = signatureProps.subtest_signatures;
}
var name = signatureProps.suite + " " + testName +
" " + optionCollectionMap[signatureProps.option_collection_hash] + extra;

//Only keep summary signatures, filter in/out e10s and pgo
if (name.indexOf('summary') <= 0) {
return null;
}
if (e10s && (name.indexOf('e10s') <= 0)) {
return null;
} else if (!e10s && (name.indexOf('e10s') > 0)) {
return null;
}

//TODO: pgo is linux/windows only- what about osx and android
if (pgo && (name.indexOf('pgo') <= 1)) {
return null;
} else if (!pgo && (name.indexOf('pgo') > 0)) {
return null;
}

return { name: name, signature: signature, platform: platform,
subtestSignatures: subtestSignatures };
};
}]);

comparePerf.controller('CompareChooserCtrl', [ '$state', '$stateParams',
perf.controller('CompareChooserCtrl', [ '$state', '$stateParams',
'$scope',
'$rootScope', '$location',
'thServiceDomain', '$http',
Expand All @@ -98,7 +55,7 @@ comparePerf.controller('CompareChooserCtrl', [ '$state', '$stateParams',
});
}]);

comparePerf.controller('CompareResultsCtrl', [ '$state', '$stateParams', '$scope', '$rootScope', '$location',
perf.controller('CompareResultsCtrl', [ '$state', '$stateParams', '$scope', '$rootScope', '$location',
'thServiceDomain', '$http', '$q', '$timeout', 'getSeriesSummary',
function CompareResultsCtrl($state, $stateParams, $scope, $rootScope, $location,
thServiceDomain, $http, $q, $timeout, getSeriesSummary) {
Expand All @@ -109,103 +66,93 @@ comparePerf.controller('CompareResultsCtrl', [ '$state', '$stateParams', '$scope
$scope.testList = [];
$scope.platformList = [];

var signatureURL = thServiceDomain + '/api/project/' + $scope.originalProject +
function getSeriesData(projectName, e10s, pgo) {
var signatureURL = thServiceDomain + '/api/project/' + projectName +
'/performance-data/0/get_performance_series_summary/?interval=' +
$scope.timeRange;

$http.get(signatureURL).then(
function(response) {
return $http.get(signatureURL).then(function(response) {
var seriesList = [];
var platformList = [];
var testList = [];

Object.keys(response.data).forEach(function(signature) {
var seriesSummary = getSeriesSummary(signature,
response.data[signature],
optionCollectionMap,
$stateParams.pgo,
$stateParams.e10s);

if (seriesSummary != null && seriesSummary.signature !== undefined) {
optionCollectionMap);

// Only keep summary signatures, filter in/out e10s and pgo
if (!seriesSummary.subtestSignatures ||
(e10s && !_.contains(seriesSummary.options, 'e10s')) ||
(!e10s && _.contains(seriesSummary.options, 'e10s')) ||
(pgo && !_.contains(seriesSummary.options, 'pgo')) ||
(!pgo && _.contains(seriesSummary.options, 'pgo'))) {
return; // skip, not valid
} else {
seriesList.push(seriesSummary);

if ($scope.platformList.indexOf(seriesSummary.platform) === -1) {
$scope.platformList.push(seriesSummary.platform);
// add test/platform to lists if not yet present
if (!_.contains(platformList, seriesSummary.platform)) {
platformList.push(seriesSummary.platform);
}

if ($scope.testList.indexOf(seriesSummary.name) === -1) {
$scope.testList.push(seriesSummary.name);
if (!_.contains(testList, seriesSummary.name)) {
testList.push(seriesSummary.name);
}
}
});

// find summary results for all tests/platforms for the original rev
var signatureURL = thServiceDomain + '/api/project/' +
$scope.originalProject + '/performance-data/0/' +
'get_performance_data/?interval_seconds=' + $scope.timeRange;
return {
seriesList: seriesList,
platformList: platformList,
testList: testList
};
});
}

// TODO: figure how how to reduce these maps
var rawResultsMap = {};
function getResultsMap(projectName, seriesList, timeRange, resultSetId) {
var baseURL = thServiceDomain + '/api/project/' +
projectName + '/performance-data/0/' +
'get_performance_data/?interval_seconds=' + timeRange;

$q.all(seriesList.map(function(series) {
return $http.get(signatureURL + "&signatures=" + series.signature).then(function(response) {
var resultsMap = {};
return $q.all(seriesList.map(function(series) {
return $http.get(baseURL + "&signatures=" + series.signature).then(
function(response) {
response.data.forEach(function(data) {
rawResultsMap[data.series_signature] = calculateStats(data.blob, $scope.originalResultSetID);
rawResultsMap[data.series_signature].name = series.name;
rawResultsMap[data.series_signature].platform = series.platform;
});
});
})).then(function () {
// find summary results for all tests/platforms for the original rev
var signatureURL = thServiceDomain + '/api/project/' +
$scope.newProject + '/performance-data/0/' +
'get_performance_data/?interval_seconds=' + $scope.timeRange;

//ok, now get the new revision
var signatureListURL = thServiceDomain + '/api/project/' + $scope.newProject +
'/performance-data/0/get_performance_series_summary/?interval=' +
$scope.timeRange;

var newRawResultsMap = {};
var newSeriesList = [];

$http.get(signatureListURL).then(function(response) {
Object.keys(response.data).forEach(function(signature) {
var seriesSummary = getSeriesSummary(signature,
response.data[signature],
optionCollectionMap,
$stateParams.pgo,
$stateParams.e10s);

if (seriesSummary != null && seriesSummary.signature !== undefined) {
newSeriesList.push(seriesSummary);

if ($scope.platformList.indexOf(seriesSummary.platform) === -1) {
$scope.platformList.push(seriesSummary.platform);
}

if ($scope.testList.indexOf(seriesSummary.name) === -1) {
$scope.testList.push(seriesSummary.name);
}
}
});
$scope.testList.sort();
$scope.platformList.sort();

$q.all(newSeriesList.map(function(series) {
return $http.get(signatureURL + "&signatures=" + series.signature).then(function(response) {
response.data.forEach(function(data) {
newRawResultsMap[data.series_signature] = calculateStats(data.blob, $scope.newResultSetID);
newRawResultsMap[data.series_signature].name = series.name;
newRawResultsMap[data.series_signature].platform = series.platform;
});
});
})).then(function () {
$scope.dataLoading = false;
displayResults(rawResultsMap, newRawResultsMap);
resultsMap[data.series_signature] = calculateStats(
data.blob, resultSetId);
resultsMap[data.series_signature].name = series.name;
resultsMap[data.series_signature].platform = series.platform;
});
})
})).then(function() {
return resultsMap;
});
}

getSeriesData($scope.originalProject, $scope.e10s, $scope.pgo).then(
function(originalSeriesData) {
$scope.platformList = originalSeriesData.platformList;
$scope.testList = originalSeriesData.platformList;
return getResultsMap($scope.originalProject,
originalSeriesData.seriesList,
$scope.timeRange,
$scope.originalResultSetID);
}).then(function(originalResultsMap) {
getSeriesData($scope.newProject, $scope.e10s, $scope.pgo).then(
function(newSeriesData) {
$scope.platformList = _.union($scope.platformList,
newSeriesData.platformList).sort();
$scope.testList = _.union($scope.testList,
newSeriesData.testList).sort();
return getResultsMap($scope.newProject,
newSeriesData.seriesList,
$scope.timeRange,
$scope.newResultSetID);
}).then(function(newResultsMap) {
$scope.dataLoading = false;
displayResults(originalResultsMap, newResultsMap);
});
});
}
);
});
}

//TODO: put this into a generic library
Expand Down Expand Up @@ -381,18 +328,3 @@ comparePerf.controller('CompareResultsCtrl', [ '$state', '$stateParams', '$scope
displayComparision();
});
}]);


comparePerf.config(function($stateProvider, $urlRouterProvider) {
$stateProvider.state('compare', {
templateUrl: 'partials/perf/comparectrl.html',
url: '/compare?originalProject&originalRevision&newProject&newRevision&hideMinorChanges&e10s&pgo',
controller: 'CompareResultsCtrl'
}).state('comparechooser', {
templateUrl: 'partials/perf/comparechooserctrl.html',
url: '/comparechooser',
controller: 'CompareChooserCtrl'
});

$urlRouterProvider.otherwise('/comparechooser');
});

0 comments on commit a0c3f21

Please sign in to comment.