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

Bug 1788596 - Kill audioDecoder_Generic if hanging r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D157479
This commit is contained in:
Alexandre Lissy 2022-10-06 06:14:09 +00:00
parent 981b8ee4ca
commit 7ae16664ea
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/glue/test/browser/browser_utility_crashReporter.js
View File

@ -11,7 +11,7 @@ async function startAndCrashUtility(actors, actorsCheck) {
// When running full suite, previous audio decoding tests might have left some
// running and this might interfere with our testing
add_setup(async function ensureNoExistingProcess() {
await utilityProcessTest().stopProcess();
await killPendingUtilityProcess();
});
add_task(async function utilityNoActor() {

2
ipc/glue/test/browser/browser_utility_profiler.js
View File

@ -13,7 +13,7 @@ Services.scriptloader.loadSubScript(
// When running full suite, previous audio decoding tests might have left some
// running and this might interfere with our testing
add_setup(async function ensureNoExistingProcess() {
await utilityProcessTest().stopProcess();
await killPendingUtilityProcess();
});
add_task(async () => {

40
ipc/glue/test/browser/head.js
View File

@ -17,7 +17,7 @@ async function startUtilityProcess(actors) {
return utilityProcessTest().startProcess(actors);
}
async function cleanUtilityProcessShutdown(utilityPid) {
async function cleanUtilityProcessShutdown(utilityPid, preferKill = false) {
info(`CleanShutdown Utility Process ${utilityPid}`);
ok(utilityPid !== undefined, "Utility needs to be defined");
@ -25,7 +25,17 @@ async function cleanUtilityProcessShutdown(utilityPid) {
"ipc:utility-shutdown",
(subject, data) => parseInt(data, 10) === utilityPid
);
await utilityProcessTest().stopProcess();
if (preferKill) {
SimpleTest.expectChildProcessCrash();
info(`Kill Utility Process ${utilityPid}`);
const ProcessTools = Cc["@mozilla.org/processtools-service;1"].getService(
Ci.nsIProcessToolsService
);
ProcessTools.kill(utilityPid);
} else {
await utilityProcessTest().stopProcess();
}
let [subject, data] = await utilityProcessGone;
ok(
@ -41,6 +51,25 @@ async function cleanUtilityProcessShutdown(utilityPid) {
ok(!subject.hasKey("dumpID"), "There should be no dumpID");
}
async function killPendingUtilityProcess() {
let audioDecoderProcesses = (
await ChromeUtils.requestProcInfo()
).children.filter(p => {
return (
p.type === "utility" &&
p.utilityActors.find(a => a.actorName.startsWith("audioDecoder_Generic"))
);
});
info(`audioDecoderProcesses=${JSON.stringify(audioDecoderProcesses)}`);
for (let audioDecoderProcess of audioDecoderProcesses) {
info(`Stopping audio decoder PID ${audioDecoderProcess.pid}`);
await cleanUtilityProcessShutdown(
audioDecoderProcess.pid,
/* preferKill */ true
);
}
}
function audioTestData() {
return [
{
@ -209,11 +238,12 @@ async function crashSomeUtility(utilityPid, actorsCheck) {
const ProcessTools = Cc["@mozilla.org/processtools-service;1"].getService(
Ci.nsIProcessToolsService
);
info(`Crash Utility Process ${utilityPid}`);
ProcessTools.crash(utilityPid);
info("Waiting for utility process to go away.");
info(`Waiting for utility process ${utilityPid} to go away.`);
let [subject, data] = await utilityProcessGone;
info(`utilityPid=${utilityPid} data=${data}`);
ok(
parseInt(data, 10) === utilityPid,
`Should match the crashed PID ${utilityPid} with ${data}`
@ -240,7 +270,7 @@ async function crashSomeUtility(utilityPid, actorsCheck) {
ok(crash.id === dumpID, "Record should have an ID");
ok(
actorsCheck(crash.metadata.UtilityActorsName),
`Record should have the correct actors name: ${crash.metadata.UtilityActorsName}`
`Record should have the correct actors name for: ${crash.metadata.UtilityActorsName}`
);
});