From 55e623ff4e5d06775979505a768b8aa235f2bd75 Mon Sep 17 00:00:00 2001 From: "mbelshe@chromium.org" Date: Fri, 5 Mar 2010 18:25:49 +0000 Subject: Several benchmark updats: - several more columns of data. - added a feature to export JSON results and to compare results. BUG=none TEST=n/a Review URL: http://codereview.chromium.org/668115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40752 0039d316-1c4b-4281-b951-d872f2087c98 --- .../examples/extensions/benchmark/background.html | 43 +++++- .../examples/extensions/benchmark/manifest.json | 2 +- .../examples/extensions/benchmark/options.html | 164 +++++++++++++++++++-- 3 files changed, 189 insertions(+), 20 deletions(-) (limited to 'chrome/common/extensions') diff --git a/chrome/common/extensions/docs/examples/extensions/benchmark/background.html b/chrome/common/extensions/docs/examples/extensions/benchmark/background.html index 9c8ac52..d7af961 100644 --- a/chrome/common/extensions/docs/examples/extensions/benchmark/background.html +++ b/chrome/common/extensions/docs/examples/extensions/benchmark/background.html @@ -32,6 +32,7 @@ function formatNumber(str) { window.iterations = 10; window.clearConnections = true; window.clearCache = true; +window.useNewTabs = true; window.results = {}; window.results.data = new Array(); window.testUrl = ""; @@ -41,6 +42,8 @@ window.windowId = 0; var kTCPReadBytes = "tcp.read_bytes"; var kTCPWriteBytes = "tcp.write_bytes"; var kRequestCount = "HttpNetworkTransaction.Count"; +var kConnectCount = "tcp.connect"; +var kSpdySessionCount = "spdy.sessions"; // The list of currently running benchmarks var benchmarks = new Array(); @@ -141,6 +144,8 @@ function Benchmark() { current_ = {}; current_.url = url; + current_.startLoadResults = new Array(); // times to start + current_.commitLoadResults = new Array(); // times to commit current_.docLoadResults = new Array(); // times to docload current_.paintResults = new Array(); // times to paint current_.totalResults = new Array(); // times to complete load @@ -149,6 +154,8 @@ function Benchmark() { current_.totalTime = 0; current_.iterations = 0; current_.requests = 0; + current_.connects = 0; + current_.spdySessions = 0; } // Is the benchmark currently in progress. @@ -166,6 +173,7 @@ function Benchmark() { // Push the result. window.results.data.push(current_); + // If we're the last benchmark, close the window. if (benchmarks.length == 0) { chrome.tabs.remove(benchmarkWindow.id); @@ -201,6 +209,8 @@ function Benchmark() { initialReadBytes_ = chrome.benchmarking.counter(kTCPReadBytes); initialWriteBytes_ = chrome.benchmarking.counter(kTCPWriteBytes); initialRequestCount_ = chrome.benchmarking.counter(kRequestCount); + initialConnectCount_ = chrome.benchmarking.counter(kConnectCount); + initialSpdySessionCount_ = chrome.benchmarking.counter(kSpdySessionCount); } // Run a single page in the benchmark @@ -216,7 +226,14 @@ function Benchmark() { if (benchmarkWindow) { var benchmark = nextBenchmark(); benchmark.pageStart(); - chrome.tabs.update(benchmarkWindow.id, {"url": benchmark.url() }); + + if (window.useNewTabs) { + chrome.tabs.remove(benchmarkWindow.id); + chrome.tabs.create({"url": benchmark.url() }, + function(tab) { benchmarkWindow = tab; }); + } else { + chrome.tabs.update(benchmarkWindow.id, {"url": benchmark.url() }); + } } else { this.pageStart(); chrome.tabs.create({"url": current_.url }, @@ -226,12 +243,20 @@ function Benchmark() { // Called when a page finishes loading. this.pageFinished = function(csi) { + var requested = csi.requestTime; + var started = csi.startLoadTime; + var startLoadTime = + Math.round((csi.startLoadTime - requested) * 1000.0); + var commitLoadTime = + Math.round((csi.commitLoadTime - started) * 1000.0); var docLoadTime = - Math.round((csi.finishDocumentLoadTime - csi.startLoadTime) * 1000.0); + Math.round((csi.finishDocumentLoadTime - started) * 1000.0); var paintTime = - Math.round((csi.firstPaintTime - csi.startLoadTime) * 1000.0); + Math.round((csi.firstPaintTime - started) * 1000.0); var totalTime = - Math.round((csi.finishLoadTime - csi.startLoadTime) * 1000.0); + Math.round((csi.finishLoadTime - started) * 1000.0); + var firstPaintAfterLoadTime = + Math.round((csi.firstPaintAfterLoadTime - started) * 1000.0); if (paintTime < 0) { // If the user navigates away from the test while it is running, @@ -249,6 +274,8 @@ function Benchmark() { // Record the result current_.iterations++; + current_.startLoadResults.push(startLoadTime); + current_.commitLoadResults.push(commitLoadTime); current_.docLoadResults.push(docLoadTime); current_.paintResults.push(paintTime); current_.totalResults.push(totalTime); @@ -258,6 +285,10 @@ function Benchmark() { initialWriteBytes_; current_.requests += chrome.benchmarking.counter(kRequestCount) - initialRequestCount_; + current_.connects += chrome.benchmarking.counter(kConnectCount) - + initialConnectCount_; + current_.spdySessions += chrome.benchmarking.counter(kSpdySessionCount) - + initialSpdySessionCount_; current_.totalTime += totalTime; if (--runCount_ == 0) { @@ -266,6 +297,10 @@ function Benchmark() { // If there are more tests, schedule them if (runCount_ > 0 || benchmarks.length > 0) { + if (window.clearConnections) { + chrome.benchmarking.closeConnections(); + } + setTimeout(me_.runPage, 100); } diff --git a/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json b/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json index 886f40a..485c616 100644 --- a/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json @@ -10,7 +10,7 @@ "options_page": "options.html", "content_scripts": [ { - "matches": ["http://*/*"], + "matches": ["https://*/*", "http://*/*"], "js": ["script.js"] } ], diff --git a/chrome/common/extensions/docs/examples/extensions/benchmark/options.html b/chrome/common/extensions/docs/examples/extensions/benchmark/options.html index 34f203c..ef7e957 100644 --- a/chrome/common/extensions/docs/examples/extensions/benchmark/options.html +++ b/chrome/common/extensions/docs/examples/extensions/benchmark/options.html @@ -137,13 +137,8 @@ Array.stddev = function(array) { // Object to summarize everything var totals = {}; -// Computes min/max/mean/stddev, etc all up front. -function computeResults(data) { - totals = {}; - totals.mean = 0; - totals.paintMean = 0; - totals.docLoadMean = 0; - +// Compute the results for a data set. +function computeDisplayResults(data) { var count = data.data.length; for (var i = 0; i < count; i++) { var obj = data.data[i]; @@ -157,17 +152,98 @@ function computeResults(data) { obj.readKB = obj.bytesRead / 1024; obj.writeKB = obj.bytesWritten / 1024; obj.paintMean = Array.avg(obj.paintResults); + obj.startLoadMean = Array.avg(obj.startLoadResults); + obj.commitLoadMean = Array.avg(obj.commitLoadResults); obj.docLoadMean = Array.avg(obj.docLoadResults); + obj.displayRequests = obj.requests; + obj.displayConnects = obj.connects + obj.displaySpdySessions = obj.spdySessions; + } + return count; +} + +// Subtract the results from two data sets. +// This function could be smarter about what it subtracts, +// for now it just subtracts everything. +// Returns true if it was able to compare the two data sets. +function subtractData(data, baseline) { + var count = data.data.length; + if (baseline.data.length != count) { + return false; + } + for (var i = 0; i < count; i++) { + var obj = data.data[i]; + var obj2 = baseline.data[i]; + + // The data sets are different. + if (obj.url != obj2.url || + obj.iterations != obj2.iterations) { + return false; + } + + obj.mean -= obj2.mean; + obj.stddev -= obj2.stddev; + obj.min -= obj2.min; + obj.max -= obj2.max; + obj.readbps -= obj2.readbps; + obj.writebps -= obj2.writebps; + obj.readKB -= obj2.readKB; + obj.writeKB -= obj2.writeKB; + obj.paintMean -= obj2.paintMean; + obj.startLoadMean -= obj2.startLoadMean; + obj.commitLoadMean -= obj2.commitLoadMean; + obj.docLoadMean -= obj2.docLoadMean; + + obj.displayRequests -= obj2.displayRequests; + obj.displayConnects -= obj2.displayConnects; + obj.displaySpdySessions -= obj2.displaySpdySessions; + } + return true; +} + +// Compute totals based on a data set. +function computeTotals(data) { + var count = data.data.length; + for (var i = 0; i < count; i++) { + var obj = data.data[i]; totals.mean += obj.mean; totals.paintMean += obj.paintMean; + totals.startLoadMean += obj.startLoadMean; + totals.commitLoadMean += obj.commitLoadMean; totals.docLoadMean += obj.docLoadMean; } +} + +// Compute results for the data with an optional baseline. +// If |baseline| is undefined, will compute the results of this +// run. Otherwise, computes the diff between this data and the baseline. +function computeResults(data, baseline) { + totals = {}; + totals.mean = 0; + totals.paintMean = 0; + totals.startLoadMean = 0; + totals.commitLoadMean = 0; + totals.docLoadMean = 0; + + var count = computeDisplayResults(data); + + if (baseline) { + computeDisplayResults(baseline); + if (!subtractData(data, baseline)) { + alert("These data sets are different"); + document.getElementById("baseline").value = ""; + return; + } + } + computeTotals(data); totals.url = "(" + count + " urls)"; if (count > 0) { totals.mean /= count; totals.paintMean /= count; + totals.startLoadMean /= count; + totals.commitLoadMean /= count; totals.docLoadMean /= count; } @@ -185,7 +261,21 @@ function jsinit() { // Run the template to show results var data = extension.results; - computeResults(data); + + // Get the baseline results + var elt = document.getElementById("baseline"); + var baseline_json = document.getElementById("baseline").value; + var baseline; + if (baseline_json) { + try { + baseline = JSON.parse(baseline_json); + } catch (e) { + alert("JSON parse error: " + e); + } + } + + // Compute + computeResults(data, baseline); var context = new JsEvalContext(data); context.setVariable('$width', 0); @@ -197,11 +287,21 @@ function jsinit() { document.getElementById("iterations").value = extension.iterations; document.getElementById("clearconns").checked = extension.clearConnections; document.getElementById("clearcache").checked = extension.clearCache; + document.getElementById("newtabs").checked = extension.useNewTabs; setUrl(extension.testUrl); + + if (!baseline) { + var json_data = JSON.stringify(data); + document.getElementById("json").value = json_data; + } } function getWidth(mean, obj) { + var kMinWidth = 200; var max_width = obj.offsetWidth; + if (max_width < kMinWidth) { + max_width = kMinWidth; + } return Math.floor(max_width * (mean / max_sample)); } @@ -211,22 +311,27 @@ function config() { var iterations = parseInt(document.getElementById("iterations").value); var clearConnections = document.getElementById("clearconns").checked; var clearCache = document.getElementById("clearcache").checked; + var useNewTabs = document.getElementById("newtabs").checked; if (iterations > 0) { extension.iterations = iterations; extension.clearConnections = clearConnections; extension.clearCache = clearCache; + extension.useNewTabs = useNewTabs; } } // Set the url in the benchmark url box. function setUrl(url) { document.getElementById("testurl").value = url; - console.log(url); - console.log(document.getElementById("testurl").value); } // Start the benchmark. function run() { + if (!chrome.benchmarking) { + alert("Warning: Looks like you forgot to run chrome with " + + " --enable-benchmarking set."); + return; + } var extension = chrome.extension.getBackgroundPage(); var testUrl = document.getElementById("testurl").value; extension.testUrl = testUrl; @@ -238,8 +343,20 @@ function clearResults() { var extension = chrome.extension.getBackgroundPage(); extension.results = {}; extension.results.data = new Array(); + document.getElementById("json").value = ""; + document.getElementById("baseline").value = ""; jsinit(); } + +// Toggle display of an element +function toggle(id) { + var elt = document.getElementById(id); + if (elt.style.display == "none") { + elt.style.display = "block"; + } else { + elt.style.display = "none"; + } +} @@ -255,6 +372,7 @@ function clearResults() { Clear Connections? Clear Cache? +Use New Tabs Per Page?
URL to load

@@ -265,8 +383,10 @@ Clear Cache? - + + + @@ -274,16 +394,20 @@ Clear Cache? + + - + + @@ -295,19 +419,25 @@ Clear Cache? + + + + - + + + @@ -319,7 +449,11 @@ Clear Cache?
urlurl iterationsstart load meancommit load mean doc load mean paint mean total mean min max # Requests# Connects# SPDY Sessions Read KB Write KB Read KBps Write KBps +
TOTALS
- +

+JSON data
+

+COMPARE to
+

-- cgit v1.1