Console view bug fixes and improvements#2461
Console view bug fixes and improvements#2461iloveeclipse merged 8 commits intoeclipse-platform:masterfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes a deadlock issue (#2460) that occurred when terminating launches. The deadlock happened because the UI thread would wait for a lock on ProcessConsole to update the console name, while console code was blocked waiting for a QueueProcessingJob to execute on the same UI thread. The fix introduces a separate ScheduledExecutorService to handle console name updates asynchronously, avoiding direct calls from the UI thread to ProcessConsole.resetName().
Changes:
- Replaced UI thread timer-based scheduling (
Display.timerExec) with a dedicatedScheduledExecutorServicefor console name updates - Added proper executor cleanup in the
dispose()method - Introduced tracking of pending name update tasks to avoid duplicate scheduling
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Outdated
Show resolved
Hide resolved
|
@trancexpress : if you can reproduce, please try this PR. Beside this, I wonder if this task that updates console every second must be always executed, even if console is hidden behind other one. This is definitely a resource waste. Start ~6 processes with Console and enjoy that every 100 ms some task is executed updating some of the consoles. This makes no sense. So probably the code has to be rewritten to avoid parallel updates of hidden console pages. |
|
I wasn't able to reproduce the deadlock when I tried. Likely it needs stepping with breakpoints, I've not checked how to do that. |
16c60c8 to
36cf40b
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated 6 comments.
Comments suppressed due to low confidence (1)
debug/org.eclipse.ui.console/src/org/eclipse/ui/console/IConsole.java:127
- The documentation contains a grammatical error: "is not more visible" should be "is no longer visible".
* this console is not more visible to user.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
Show resolved
Hide resolved
debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Show resolved
Hide resolved
36cf40b to
3d746e1
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Show resolved
Hide resolved
9c4a0ab to
f99cfcf
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 18 out of 18 changed files in this pull request and generated 5 comments.
Comments suppressed due to low confidence (1)
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java:177
- The executor thread is created with a fixed name (
"Console name updater"). If multiple process consoles are active, thread dumps will show many identical thread names, making diagnostics harder. Consider including a unique suffix (e.g., process id/label orSystem.identityHashCode(this)) in the thread name.
consoleNameUpdateExecutor = Executors.newSingleThreadExecutor(r -> {
Thread t = new Thread(r, "Console name updater"); //$NON-NLS-1$
t.setDaemon(true);
return t;
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Show resolved
Hide resolved
debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
Outdated
Show resolved
Hide resolved
debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
Show resolved
Hide resolved
- Extracted common code from ShowConsoleViewJob to AbstractConsoleJob - Renamed RepaintJob to RedrawJob, switched to use AbstractConsoleJob - Extracted anonymous UI job to WarnAboutContentChangedJob, based on AbstractConsoleJob - fWarnQueued is not needed anymore for WarnAboutContentChangedJob - This above fixes the race condition where multiple consoles changes could have triggered the warnOfContentChange(), but the job only scheduled for the first one - Moved final field inits to constructor - Fixed potential NP in RedrawJob and ShowConsoleViewJob See eclipse-platform#2477
`page.findView(IConsoleConstants.ID_CONSOLE_VIEW)` API doesn't return console views opened in same page with secondary id's (== any Console views opened next to the first one in same page). So all calls to `ConsoleManager.refresh(IConsole)` were not working for such views. In SDK, this would only affect `TextConsole.addHyperlink()` code and is visible if opening Java Stack Trace view as secondary view - it will not show hyperlinks. Worse, since view id's are persisted across sessions, such views would not work properly as long as they present in the perspective. For the fix, make use of views registered in ConsoleManager and iterate over them, similar to ShowConsoleViewJob code. See eclipse-platform#2477
Original code had multiple issues: it didn't notified about console content changes in all opened windows, it didn't notified for the console changes in all secondary console views but it notified even if the console with changes was visible. As noticed already before, `page.findView(IConsoleConstants.ID_CONSOLE_VIEW)` API doesn't return console views opened in same page with secondary id's (== any Console views opened next to the first one in same page). So WarnAboutContentChangedJob only supported Console views without secondary ids and only in the currently active window. - Notify console changes in all windows, not only in the active one - Notify also for secondary consoles - Don't notify about console changes if changed console page is visible (== top of the stack) in the current Console view and Console view is also visible. Fixes eclipse-platform#2477
- Moved final field inits to constructor - Get rid of unneeded or duplicated code, obsoleted comments - Use instanceof variables - Fix spelling mistakes - Changed all access to fActiveConsole via get/set methods
- Moved final field inits to constructor - Added trivial toString() implementation to the AbstractConsole - Fixed possible NP in IOConsole
- Moved final field inits to constructor - Removed useless javadocs - Use instanceof variables where possible - Added "disposed" field and checks before each asyncExec() for that - Refactored computeName() to readable code -- split into multiple logical parts -- made things static which are static -- don't do anything if view is already disposed - Use imports in ProcessConsoleTests
This fixes regression from 7e1f60c, where main thread (which owns lock on UI operations) waits for the lock on ProcessConsole to update console name but never gets it because console code is blocked internally waiting for a QueueProcessingJob being executed on UI thread. The solution is to avoid direct calls from UI to ProcessConsole.resetName(). Fixes eclipse-platform#2460
f99cfcf to
6da6842
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 18 out of 18 changed files in this pull request and generated no new comments.
Comments suppressed due to low confidence (3)
debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java:702
- The assertion failure message says "minimized" but this block hides the view via
activePage.hideView(consoleView). Consider updating the message text to reflect the actual action (hidden vs minimized) to make test failures easier to interpret.
activePage.hideView(consoleView);
// Wait >1 second for update
TestUtil.processUIEvents(2000);
assertEquals(console1NameAfterReshow, console1.getName(), "Console name should not update when console view is minimized");
assertEquals(console2NameAfterReshow, console2.getName(), "Console name should not update when console view is minimized");
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java:1257
pageHidden()callscomputeName(false)but ignores the return value, andcomputeName(false)has no side effects whentriggerAsyncUpdateis false. This makes the call a no-op aside from extra work; consider removing it (visibility is already tracked viaisVisible = false, which stops the updater viacanUpdateConsoleName()).
@Override
public void pageHidden() {
isVisible = false;
computeName(false);
}
debug/org.eclipse.ui.console/src/org/eclipse/ui/console/IConsole.java:128
- Javadoc: "not more visible" is grammatically incorrect/unclear. Consider changing to "no longer visible" (or similar) to make the API contract easier to understand for implementers.
* <p>
* Subclasses may override this method to be notified when the console page for
* this console is not more visible to user.
* </p>
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
6da6842 to
1f8136b
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 18 out of 18 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (2)
debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleShowHideTests.java:65
- Use
IConsoleConstants.ID_CONSOLE_VIEWinstead of the hard-coded view id string ("org.eclipse.ui.console.ConsoleView") to avoid drift if the id ever changes and to match usage elsewhere in the test suite.
consoles[i] = new ConsoleMock(i + 1);
}
consoleView = (ConsoleView) activePage.showView("org.eclipse.ui.console.ConsoleView");
activePage.activate(consoleView);
TestUtil.processUIEvents(100);
debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleMock.java:92
- Spelling/grammar: "This listener is get called" should be "This listener is called".
// This listener is get called if the page is really shown
// in the console view
getControl().addListener(SWT.Show, event -> {
int count = showCalled.incrementAndGet();
if (count == 1) {
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
Show resolved
Hide resolved
- Added new API to allow console pages knew whether they are visible or not. - Use new IConsole API to schedule console updates only if console page is visible (top level) in the console view. This prevents multiple opened consoles in same console view run update tasks every second, even if no one can see the updated console name. - Don't update console label if the elapsed time format is set to "None" - Update console elapsed time format for running processes if preference changes - Added tests Fixes eclipse-platform#2478
1f8136b to
8db7286
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 18 out of 18 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Console View Bug Fixes and Improvements
Summary
This PR addresses multiple issues in the Eclipse Console infrastructure, including a deadlock regression, broken behavior with secondary console views, incorrect content change notifications, and unnecessary performance overhead from hidden console updates. It also includes code cleanup across related classes.
Issues Fixed
Changes
Bug Fixes
Don't use display thread for scheduling console update tasks (
280174fe)Fixes a regression from
7e1f60cwhere the main thread (holding the UI operations lock) waits for the lock onProcessConsoleto update the console name but never gets it, because the console code is blocked internally waiting for aQueueProcessingJobbeing executed on the UI thread. The fix avoids direct calls from the UI thread toProcessConsole.resetName().Fix link redraw issues with secondary consoles (
4477d7ed)page.findView(IConsoleConstants.ID_CONSOLE_VIEW)does not return console views opened in the same page with secondary IDs (i.e., any Console views opened alongside the first one). This caused all calls toConsoleManager.refresh(IConsole)to silently fail for such views. In the SDK, this brokeTextConsole.addHyperlink()— visible when opening the Java Stack Trace view as a secondary view (no hyperlinks shown). Since view IDs are persisted across sessions, these views remained broken indefinitely. The fix iterates over views registered inConsoleManager, similar toShowConsoleViewJob.Fix console content notifications (
e22266f1)The original notification code had multiple issues:
The fix ensures notifications are sent to all windows and secondary console views, while suppressing them when the changed console page is already visible (top of the stack) and the Console view itself is visible.
Don't update consoles every second if not needed (
8db7286)IConsoleAPI to allow console pages to know whether they are visible or not. Console name updates are now scheduled only when the console page is visible (top level) in the console view. This prevents multiple opened consoles in the same view from running update tasks every second when no one can see them.None.changes.
Code Cleanup & Refactoring
Manual code cleanup & fixes in ConsoleManager (
1de591c6)ShowConsoleViewJobintoAbstractConsoleJobRepaintJobtoRedrawJob, switched to useAbstractConsoleJobWarnAboutContentChangedJob, based onAbstractConsoleJobfWarnQueuedfield — fixes a race condition where multiple console changes could triggerwarnOfContentChange()but the job only scheduled for the first oneRedrawJobandShowConsoleViewJobManual code cleanup ConsoleView (
46309240)instanceofpattern variablesfActiveConsolevia getter/setter methodsManual code cleanup for base Console classes (
4accaf99)toString()implementation toAbstractConsoleIOConsoleProcessConsole.computeName() refactoring and smaller fixes (
174da5c0)instanceofpattern variables where possibledisposedfield and checks before eachasyncExec()callcomputeName()into readable code:ProcessConsoleTestsNew API
IConsole.pageShown()IConsole.pageHidden()— Allows console pages to be notified about their visibility stateIConsoleManager.consoleShown()IConsoleManager.consoleHidden()— New API additions for managing console visibility state and notificationsTesting
ConsoleShowHideTestswith comprehensive tests for console visibility behaviorConsoleManagerTestsandProcessConsoleTestswith additional test coverage