Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent sending multiple kill signals to the same PID #2541

Merged
merged 1 commit into from Jun 11, 2020
Merged

Prevent sending multiple kill signals to the same PID #2541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/debug/dart_debug_impl.ts
View file
Open in desktop
Expand Up @@ -38,7 +38,14 @@ const trailingSemicolonPattern = new RegExp(`;\\s*$`, "m");
export class DartDebugSession extends DebugSession {
// TODO: Tidy all this up
protected childProcess?: SpawnedProcess | RemoteEditorTerminalProcess;
protected additionalPidsToTerminate: number[] = [];

/** The additional process IDs to terminate when terminating a debugging session.
*
* A Set is used so a Process ID does not appear multiple times within the collection as
* that can cause a (eg. testing) session to be terminated prematurely while waiting for it to end.
*/
protected readonly additionalPidsToTerminate = new Set<number>();

protected expectAdditionalPidToTerminate = false;
private additionalPidCompleter = new PromiseCompleter<void>();
// We normally track the pid from Observatory to terminate the VM afterwards, but for Flutter Run it's
Expand Down Expand Up @@ -597,7 +604,7 @@ export class DartDebugSession extends DebugSession {
}

protected recordAdditionalPid(pid: number) {
this.additionalPidsToTerminate.push(pid);
this.additionalPidsToTerminate.add(pid);
this.additionalPidCompleter.resolve();
}

Expand Down Expand Up @@ -723,7 +730,7 @@ export class DartDebugSession extends DebugSession {
this.isTerminating = true;
this.sendEvent(new Event("dart.terminating", { message: "Terminating debug session..." }));

if (this.expectAdditionalPidToTerminate && !this.additionalPidsToTerminate.length) {
if (this.expectAdditionalPidToTerminate && !this.additionalPidsToTerminate.size) {
this.log(`Waiting for main process PID before terminating`);
this.sendEvent(new Event("dart.terminating", { message: "Waiting for process..." }));
const didGetPid = await this.raceIgnoringErrors(() => this.additionalPidCompleter.promise, 20000);
Expand Down