mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
Bug 379317 - This change coalesces runnables into one.
This improves perceived performance as repaints are not interleaved with updates. Change-Id: If9674e45adf1aa5b4d8530e22dfcd494d228f329 Reviewed-on: https://git.eclipse.org/r/5956 Reviewed-by: Pawel Piech <pawel.piech@windriver.com> IP-Clean: Pawel Piech <pawel.piech@windriver.com> Tested-by: Pawel Piech <pawel.piech@windriver.com>
This commit is contained in:
parent
d5cb9f4f8f
commit
03d1253f68
1 changed files with 61 additions and 19 deletions
|
@ -4,15 +4,18 @@
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
* http://www.eclipse.org/legal/epl-v10.html
|
* http://www.eclipse.org/legal/epl-v10.html
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Wind River Systems - initial API and implementation
|
* Wind River Systems - initial API and implementation
|
||||||
|
* NVIDIA - coalesce runnable in the single event loop iteration
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.dsf.ui.concurrent;
|
package org.eclipse.cdt.dsf.ui.concurrent;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedList;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Queue;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.concurrent.RejectedExecutionException;
|
import java.util.concurrent.RejectedExecutionException;
|
||||||
|
|
||||||
|
@ -22,13 +25,13 @@ import org.eclipse.swt.SWTException;
|
||||||
import org.eclipse.swt.widgets.Display;
|
import org.eclipse.swt.widgets.Display;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple executor which uses the display thread to run the submitted
|
* A simple executor which uses the display thread to run the submitted
|
||||||
* runnables. It only implements the {@link Executor}, and NOT the more
|
* runnables. It only implements the {@link Executor}, and NOT the more
|
||||||
* sophisticated {@link DsfExecutor} (which extends
|
* sophisticated {@link DsfExecutor} (which extends
|
||||||
* {@link java.util.concurrent.ScheduledExecutorService}). However, this
|
* {@link java.util.concurrent.ScheduledExecutorService}). However, this
|
||||||
* implementation is much more efficient than DisplayDsfExecutor as it does
|
* implementation is much more efficient than DisplayDsfExecutor as it does
|
||||||
* not use a separate thread or maintain its own queue.
|
* not use a separate thread or maintain its own queue.
|
||||||
*
|
*
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
public class SimpleDisplayExecutor implements Executor{
|
public class SimpleDisplayExecutor implements Executor{
|
||||||
|
@ -36,13 +39,13 @@ public class SimpleDisplayExecutor implements Executor{
|
||||||
* Internal mapping of display objects to executors.
|
* Internal mapping of display objects to executors.
|
||||||
*/
|
*/
|
||||||
private static Map<Display, SimpleDisplayExecutor> fExecutors = Collections.synchronizedMap( new HashMap<Display, SimpleDisplayExecutor>() );
|
private static Map<Display, SimpleDisplayExecutor> fExecutors = Collections.synchronizedMap( new HashMap<Display, SimpleDisplayExecutor>() );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Factory method for display executors.
|
* Factory method for display executors.
|
||||||
* @param display Display to create an executor for.
|
* @param display Display to create an executor for.
|
||||||
* @return The new (or re-used) executor.
|
* @return The new (or re-used) executor.
|
||||||
*/
|
*/
|
||||||
public static SimpleDisplayExecutor getSimpleDisplayExecutor(Display display) {
|
public static SimpleDisplayExecutor getSimpleDisplayExecutor(final Display display) {
|
||||||
synchronized (fExecutors) {
|
synchronized (fExecutors) {
|
||||||
SimpleDisplayExecutor executor = fExecutors.get(display);
|
SimpleDisplayExecutor executor = fExecutors.get(display);
|
||||||
if (executor == null) {
|
if (executor == null) {
|
||||||
|
@ -52,26 +55,65 @@ public class SimpleDisplayExecutor implements Executor{
|
||||||
return executor;
|
return executor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The display class used by this executor to execute the submitted runnables.
|
* The display class used by this executor to execute the submitted runnables.
|
||||||
*/
|
*/
|
||||||
private final Display fDisplay;
|
private final Display fDisplay;
|
||||||
|
/**
|
||||||
private SimpleDisplayExecutor(Display display) {
|
* Runnables waiting for the UI loop iteration
|
||||||
|
*/
|
||||||
|
private Queue<Runnable> runnables;
|
||||||
|
|
||||||
|
private SimpleDisplayExecutor(final Display display) {
|
||||||
fDisplay = display;
|
fDisplay = display;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(Runnable command) {
|
public void execute(final Runnable command) {
|
||||||
try {
|
final boolean needsPosting = enqueue(command);
|
||||||
fDisplay.asyncExec(command);
|
if (needsPosting) {
|
||||||
} catch (SWTException e) {
|
try {
|
||||||
if (e.code == SWT.ERROR_DEVICE_DISPOSED) {
|
fDisplay.asyncExec(new Runnable() {
|
||||||
throw new RejectedExecutionException("Display " + fDisplay + " is disposed", e); //$NON-NLS-1$ //$NON-NLS-2$
|
@Override
|
||||||
} else {
|
public void run() {
|
||||||
throw e;
|
runInSwtThread();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (final SWTException e) {
|
||||||
|
if (e.code == SWT.ERROR_DEVICE_DISPOSED) {
|
||||||
|
throw new RejectedExecutionException("Display " + fDisplay + " is disposed", e); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
|
} else {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private synchronized boolean enqueue(final Runnable runnable) {
|
||||||
|
boolean needsPosting = false;
|
||||||
|
if (runnables == null) {
|
||||||
|
runnables = new LinkedList<Runnable>();
|
||||||
|
needsPosting = true;
|
||||||
|
}
|
||||||
|
runnables.offer(runnable);
|
||||||
|
return needsPosting;
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized Runnable getNextRunnable() {
|
||||||
|
final Runnable runnable = runnables.poll();
|
||||||
|
if (runnable == null) {
|
||||||
|
runnables = null;
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
return runnable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void runInSwtThread() {
|
||||||
|
Runnable runnable;
|
||||||
|
while ((runnable = getNextRunnable()) != null) {
|
||||||
|
runnable.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue