Backout 3bd7584753ae for test failures

This commit is contained in:
Marco Bonardo 2012-01-30 12:49:27 +01:00
parent 435f5924ba
commit d795f46f40

View File

@ -184,9 +184,6 @@ TelemetryPing.prototype = {
// duplicate submissions.
_uuid: generateUUID(),
_prevSession: null,
// Regex that matches histograms we care about during startup.
_startupHistogramRegex: /SQLITE|HTTP|SPDY|CACHE|DNS/,
_slowSQLStartup: {},
/**
* Returns a set of histograms that can be converted into JSON
@ -385,27 +382,17 @@ TelemetryPing.prototype = {
this.addValue(mr.path, id, val);
}
},
/**
* Return true if we're interested in having a STARTUP_* histogram for
* the given histogram name.
*/
isInterestingStartupHistogram: function isInterestingStartupHistogram(name) {
return this._startupHistogramRegex.test(name);
},
/**
* Make a copy of interesting histograms at startup.
* Make a copy of sqlite histograms on startup
*/
gatherStartupInformation: function gatherStartupInformation() {
gatherStartupSqlite: function gatherStartupSqlite() {
let info = Telemetry.registeredHistograms;
let snapshots = Telemetry.histogramSnapshots;
let sqlite_re = /SQLITE/;
for (let name in info) {
// Only duplicate interesting histograms with actual data.
if (this.isInterestingStartupHistogram(name) && name in snapshots)
if (sqlite_re.test(name))
Telemetry.histogramFrom("STARTUP_" + name, name);
}
this._slowSQLStartup = Telemetry.slowSQL;
},
/**
@ -449,10 +436,6 @@ TelemetryPing.prototype = {
payloadObj.simpleMeasurements = getSimpleMeasurements();
payloadObj.histograms = this.getHistograms(Telemetry.histogramSnapshots);
payloadObj.slowSQL = Telemetry.slowSQL;
if (Object.keys(this._slowSQLStartup.mainThread).length
|| Object.keys(this._slowSQLStartup.otherThreads).length) {
payloadObj.slowSQLStartup = this._slowSQLStartup;
}
}
return { previous: !!havePreviousSession, slug: slug, payload: JSON.stringify(payloadObj) };
},
@ -619,7 +602,7 @@ TelemetryPing.prototype = {
}
break;
case "sessionstore-windows-restored":
this.gatherStartupInformation();
this.gatherStartupSqlite();
break;
case "idle-daily":
// Enqueue to main-thread, otherwise components may be inited by the