Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1150646 - Ensure that memory stats show up in treeherder logs. r=chmanchester

Browse Source
This commit is contained in:
Tom Tromey 2015-04-03 11:19:00 -04:00
parent 2f18087b14
commit 30cdc5115e
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mochitest/browser-test.js
View File

@ -513,8 +513,7 @@ Tester.prototype = {
.getService(Ci.nsIXULRuntime)
.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT)
{
this.MemoryStats.dump(this.dumper.structuredLogger,
this.currentTestIndex,
this.MemoryStats.dump(this.currentTestIndex,
this.currentTest.path,
gConfig.dumpOutputDirectory,
gConfig.dumpAboutMemoryAfterTest,

21
testing/mochitest/tests/SimpleTest/MemoryStats.js
View File

@ -53,12 +53,17 @@ MemoryStats.constructPathname = function (directory, basename) {
return d.path;
}
MemoryStats.dump = function (logger,
testNumber,
MemoryStats.dump = function (testNumber,
testURL,
dumpOutputDirectory,
dumpAboutMemory,
dumpDMD) {
// Use dump because treeherder uses --quiet, which drops 'info'
// from the structured logger.
var info = function(message) {
dump(message + "\n");
};
var mrm = MemoryStats._getService("@mozilla.org/memory-reporter-manager;1",
"nsIMemoryReporterManager");
for (var stat in MemoryStats._hasMemoryStatistics) {
@ -75,9 +80,9 @@ MemoryStats.dump = function (logger,
MemoryStats._hasMemoryStatistics[stat] = supported;
}
if (supported == MEM_STAT_SUPPORTED) {
logger.info("MEMORY STAT " + stat + " after test: " + mrm[stat]);
info("MEMORY STAT " + stat + " after test: " + mrm[stat]);
} else if (firstAccess) {
logger.info("MEMORY STAT " + stat + " not supported in this build configuration.");
info("MEMORY STAT " + stat + " not supported in this build configuration.");
}
}
@ -85,11 +90,11 @@ MemoryStats.dump = function (logger,
var basename = "about-memory-" + testNumber + ".json.gz";
var dumpfile = MemoryStats.constructPathname(dumpOutputDirectory,
basename);
logger.info(testURL + " | MEMDUMP-START " + dumpfile);
info(testURL + " | MEMDUMP-START " + dumpfile);
var md = MemoryStats._getService("@mozilla.org/memory-info-dumper;1",
"nsIMemoryInfoDumper");
md.dumpMemoryReportsToNamedFile(dumpfile, function () {
logger.info("TEST-INFO | " + testURL + " | MEMDUMP-END");
info("TEST-INFO | " + testURL + " | MEMDUMP-END");
}, null, /* anonymize = */ false);
}
@ -98,7 +103,7 @@ MemoryStats.dump = function (logger,
var basename = "dmd-" + testNumber + "-deprecated.txt";
var dumpfile = MemoryStats.constructPathname(dumpOutputDirectory,
basename);
logger.info(testURL + " | DMD-DUMP-deprecated " + dumpfile);
info(testURL + " | DMD-DUMP-deprecated " + dumpfile);
DMDReportAndDump(dumpfile);
}
@ -106,7 +111,7 @@ MemoryStats.dump = function (logger,
var basename = "dmd-" + testNumber + ".txt";
var dumpfile = MemoryStats.constructPathname(dumpOutputDirectory,
basename);
logger.info(testURL + " | DMD-DUMP " + dumpfile);
info(testURL + " | DMD-DUMP " + dumpfile);
DMDAnalyzeReports(dumpfile);
}
};

2
testing/mochitest/tests/SimpleTest/TestRunner.js
View File

@ -687,7 +687,7 @@ TestRunner.testFinished = function(tests) {
// TODO : replace this by a function that returns the mem data as an object
// that's dumped later with the test_end message
MemoryStats.dump(TestRunner.structuredLogger, TestRunner._currentTest,
MemoryStats.dump(TestRunner._currentTest,
TestRunner.currentTestURL,
TestRunner.dumpOutputDirectory,
TestRunner.dumpAboutMemoryAfterTest,