Skip to content

[WIP] Wake the startup event loop with queued work instead of display.wake() #4297

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
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[WIP] Wake the startup event loop with queued work instead of display.wake() #4297

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
23 changes: 9 additions & 14 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/application/WorkbenchAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,13 +713,7 @@ public boolean openWindows() {
final Display display = PlatformUI.getWorkbench().getDisplay();
final boolean result[] = new boolean[1];

// spawn another init thread. For API compatibility We guarantee this method is
// called from
// the UI thread but it could take enough time to disrupt progress reporting.
// spawn a new thread to do the grunt work of this initialization and spin the
// event loop
// ourselves just like it's done in Workbench.

// Restore off the UI thread and spin the event loop here, it can take a while.
final Throwable[] error = new Throwable[1];
Thread initThread = new Thread() {
@Override
Expand Down Expand Up @@ -752,13 +746,14 @@ public void runWithException() throws Throwable {
error[0] = e;
} finally {
initDone = true;
Thread.yield();
try {
Thread.sleep(5);
} catch (InterruptedException e) {
// this is a no-op in this case.
}
display.wake();
// A wake() before the UI thread reaches Display.sleep() is lost, queued
// work is not. Plain runnables would be deferred until the workbench is up.
display.asyncExec(new StartupRunnable() {
@Override
public void runWithException() {
// nothing to do
}
});
}
}
};
Expand Down
Loading