wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 904321 - Add a test for memory reporters in remote processes. r=billm.

Browse Source 
--HG--
extra : rebase_source : bc8ab4762c373f7368192e98c9ee8f8b8712940f
This commit is contained in:
Nicholas Nethercote 2013-09-17 13:13:38 -07:00
parent e26e8fed4b
commit c428bc08dc
5 changed files with 133 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/components/aboutmemory/content/aboutMemory.js
View File

@ -1737,7 +1737,9 @@ function appendTreeElements(aP, aRoot, aProcess, aPadText)
tIsInvalid = true;
let unsafePath = aUnsafeNames.join("/");
gUnsafePathsWithInvalidValuesForThisProcess.push(unsafePath);
reportAssertionFailure("Invalid value for " + flipBackslashes(unsafePath));
reportAssertionFailure("Invalid value (" + aT._amount + " / " +
aRoot._amount + ") for " +
flipBackslashes(unsafePath));
}
// For non-leaf nodes, the entire sub-tree is put within a span so it can

2
toolkit/components/aboutmemory/tests/Makefile.in
View File

@ -17,6 +17,8 @@ MOCHITEST_CHROME_FILES = \
ifndef MOZ_ASAN
MOCHITEST_CHROME_FILES += \
remote.xul \
test_memoryReporters.xul \
test_memoryReporters2.xul \
$(NULL)
endif

12
toolkit/components/aboutmemory/tests/remote.xul Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
type="text/css"?>
<window title="Remote browser"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- test results are displayed in the html:body -->
<p>Remote browser</p>
<browser type="content" src="about:blank" id="remote" remote="true"/>
</window>

8
toolkit/components/aboutmemory/tests/test_memoryReporters.xul
View File

@ -1,9 +1,10 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
<window title="Memory reporter"
<window title="Memory reporters"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- This file tests (in a rough fashion) whether the memory reporters are
producing sensible results. test_aboutmemory.xul tests the
@ -29,7 +30,6 @@
const Ci = Components.interfaces;
const Cr = Components.results;
const kUnknown = -1;
const NONHEAP = Ci.nsIMemoryReporter.KIND_NONHEAP;
const HEAP = Ci.nsIMemoryReporter.KIND_HEAP;
const OTHER = Ci.nsIMemoryReporter.KIND_OTHER;
@ -149,7 +149,7 @@
ok(aAmounts.length == 1, aName + " has " + aAmounts.length + " report");
let n = aAmounts[0];
// Check the size is reasonable -- i.e. not ridiculously large or small.
ok(n === kUnknown || (100 * 1000 <= n && n <= 10 * 1000 * 1000 * 1000),
ok(100 * 1000 <= n && n <= 10 * 1000 * 1000 * 1000,
aName + "'s size is reasonable");
}

112
toolkit/components/aboutmemory/tests/test_memoryReporters2.xul Normal file
View File

@ -0,0 +1,112 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
type="text/css"?>
<window title="Memory reporters with child processes"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
</body>
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
const Cc = Components.classes;
const Ci = Components.interfaces;
SimpleTest.waitForExplicitFinish();
// We want to know when a remote process sends us an update.
let os = Cc["@mozilla.org/observer-service;1"]
.getService(Ci.nsIObserverService);
os.addObserver(childMemoryReporterUpdate, "child-memory-reporter-update", false);
let numRemotes = 3;
// Create some remote processes, and set up message-passing so that go() is
// called once per process, once it is fully initialized.
let remotes = [];
SpecialPowers.pushPrefEnv({"set": [["dom.ipc.processCount", 3]]}, function() {
for (let i = 0; i < numRemotes; i++) {
let w = remotes[i] = window.open("remote.xul", "", "chrome");
w.addEventListener("load", function loadHandler() {
w.removeEventListener("load", loadHandler);
let remoteBrowser = w.document.getElementById("remote");
let mm = remoteBrowser.messageManager;
mm.addMessageListener("test:ready", function readyHandler() {
mm.removeMessageListener("test:ready", readyHandler);
remoteReady();
});
mm.loadFrameScript("data:," + encodeURI("sendAsyncMessage('test:ready');"), true);
});
}
});
let numReady = 0;
function remoteReady()
{
numReady++;
if (numReady == numRemotes) {
// All the remote processes are ready. Ask them for memory reports.
os.notifyObservers(null, "child-memory-reporter-request", null);
}
}
let numUpdates = 0;
function childMemoryReporterUpdate()
{
numUpdates++;
if (numUpdates == numRemotes) {
// All the remote processes have reported back. Check reports.
let vsizes = {};
// Get all the reports.
let mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
getService(Ci.nsIMemoryReporterManager);
let e = mgr.enumerateReporters();
while (e.hasMoreElements()) {
let r = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
r.collectReports(function(aProcess, aPath, aKind, aUnits, aAmount, aDesc) {
if (aPath === "vsize") {
ok(100 * 1000 <= aAmount && aAmount <= 10 * 1000 * 1000 * 1000,
"vsize is reasonable");
vsizes[aProcess] = aAmount;
}
}, null);
}
// Close the remote processes.
for (let i = 0; i < numRemotes; i++) {
remotes[i].close();
}
// Check the results.
let processes = Object.keys(vsizes);
ok(processes.length == numRemotes + 1, "correct vsize count");
let numEmptyProcesses = 0, numNonEmptyProcesses = 0;
for (let i = 0; i < processes.length; i++) {
if (processes[i] == "") {
numEmptyProcesses++;
} else {
ok(processes[i].startsWith("Content ("),
"correct non-empty process name prefix");
numNonEmptyProcesses++;
}
}
ok(numEmptyProcesses == 1, "correct empty process name count");
ok(numNonEmptyProcesses == numRemotes,
"correct non-empty process name count");
SimpleTest.finish();
}
}
]]></script>
</window>