Skip to content

Fix random failing testBug546710_ConsoleCreationRaceCondition #596 #2639

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

Draft
fedejeanne wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Draft

Fix random failing testBug546710_ConsoleCreationRaceCondition #596 #2639

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...g.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ public void testBug546710_ConsoleCreationRaceCondition(TestInfo testInfo) throws
removeAction.run();
TestUtil.waitForJobs(testInfo.getDisplayName(), ProcessConsoleManager.class, 0, 10000);
assertNull(processConsoleManager.getConsole(process1), "First console not removed.");
assertNull(processConsoleManager.getConsole(process1), "Second console not removed.");
assertNull(processConsoleManager.getConsole(process2), "Second console not removed.");
}
}
20 changes: 16 additions & 4 deletions ...clipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ protected IStatus run(IProgressMonitor monitor) {
if (monitor.isCanceled() || getConsoleDocument(process) != null) {
return Status.CANCEL_STATUS;
}
// If a launch is removed the associated console is removed too. It can happen
// that the launch is removed even before the console could be created.
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=546710#c13
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
if (!launchManager.isRegistered(launch)) {
return Status.CANCEL_STATUS;
}
IConsoleColorProvider colorProvider = getColorProvider(process.getAttribute(IProcess.ATTR_PROCESS_TYPE));
String encoding = launch.getAttribute(DebugPlugin.ATTR_CONSOLE_ENCODING);
ProcessConsole pc = new ProcessConsole(process, colorProvider, encoding);
Expand All @@ -77,10 +84,8 @@ protected IStatus run(IProgressMonitor monitor) {
// add new console to console manager.
ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { pc });

// If a launch is removed the associated console is removed too. It can happen
// that the launch is removed even before the console could be created.
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=546710#c13
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
// Check again: the launch may have been removed while the console was being
// created (race between console creation and launch removal).
if (!launchManager.isRegistered(launch)) {
removeLaunch(launch);
}
Expand Down Expand Up @@ -139,6 +144,13 @@ public void launchRemoved(ILaunch launch) {

protected void removeLaunch(ILaunch launch) {
for (IProcess process : launch.getProcesses()) {
// Cancel any pending ConsoleCreation jobs for this process to prevent
// creating a console for an already-removed launch.
for (Job job : Job.getJobManager().find(process)) {
if (job instanceof ConsoleCreation) {
job.cancel();
}
}
removeProcess(process);
}
if (fProcesses != null) {
Expand Down
Loading