This repository has been archived by the owner on Apr 3, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved Executors handling of uncaught exceptions.
- Loading branch information
1 parent
c2608cb
commit 86928bd
Showing
14 changed files
with
1,422 additions
and
1,237 deletions.
There are no files selected for viewing
198 changes: 100 additions & 98 deletions
198
plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/EngineOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,101 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2015, 2015 IBM Corporation and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Bruno Medeiros - initial API and implementation | ||
| *******************************************************************************/ | ||
| package melnorme.lang.ide.core.engine; | ||
|
|
||
| import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull; | ||
|
|
||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.Future; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| import melnorme.lang.ide.core.LangCore; | ||
| import melnorme.utilbox.concurrency.ExecutorTaskAgent; | ||
| import melnorme.utilbox.concurrency.OperationCancellation; | ||
| import melnorme.utilbox.core.CommonException; | ||
| import melnorme.utilbox.misc.Location; | ||
|
|
||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.core.runtime.IProgressMonitor; | ||
|
|
||
| public abstract class EngineOperation<RET> { | ||
|
|
||
| protected final EngineClient engineClient; | ||
|
|
||
| protected final Location location; | ||
| protected final int offset; | ||
| protected final int timeoutMillis; | ||
| protected final String opName; | ||
|
|
||
| public EngineOperation(EngineClient client, Location location, int offset, int timeoutMillis, | ||
| String opName) { | ||
| this.engineClient = client; | ||
|
|
||
| this.location = location; | ||
| this.offset = offset; | ||
| this.timeoutMillis = timeoutMillis; | ||
| this.opName = assertNotNull(opName); | ||
| } | ||
|
|
||
| public RET runEngineOperation(final IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation { | ||
|
|
||
| if(timeoutMillis <= 0 ) { | ||
| // Run directly | ||
| return doRunEngineOperation(pm); | ||
| } | ||
|
|
||
| ExecutorTaskAgent completionExecutor = new ExecutorTaskAgent(opName + " - Executor"); | ||
|
|
||
| Future<RET> future = completionExecutor.submit(new Callable<RET>() { | ||
| @Override | ||
| public RET call() throws CommonException, CoreException, OperationCancellation { | ||
| return doRunEngineOperation(pm); | ||
| } | ||
| }); | ||
|
|
||
| try { | ||
| return future.get(timeoutMillis, TimeUnit.MILLISECONDS); | ||
| } catch(ExecutionException e) { | ||
| if(e.getCause() instanceof CoreException) { | ||
| throw (CoreException) e.getCause(); | ||
| } | ||
| if(e.getCause() instanceof OperationCancellation) { | ||
| throw (OperationCancellation) e.getCause(); | ||
| } | ||
| if(e.getCause() instanceof CommonException) { | ||
| throw (CommonException) e.getCause(); | ||
| } | ||
|
|
||
| throw LangCore.createCoreException("Error performing " + opName + ".", e.getCause()); | ||
| } catch (TimeoutException e) { | ||
| throw LangCore.createCoreException("Timeout performing " + opName + ".", null); | ||
| } catch (InterruptedException e) { | ||
| throw LangCore.createCoreException("Interrupted.", e); | ||
| } finally { | ||
| completionExecutor.shutdown(); | ||
| } | ||
| } | ||
|
|
||
| protected RET doRunEngineOperation(final IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation { | ||
| engineClient.awaitUpdatedWorkingCopy(location, pm); | ||
|
|
||
| return doRunOperationWithWorkingCopy(pm); | ||
| } | ||
|
|
||
| protected abstract RET doRunOperationWithWorkingCopy(IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation; | ||
|
|
||
| /******************************************************************************* | ||
| * Copyright (c) 2015, 2015 IBM Corporation and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Bruno Medeiros - initial API and implementation | ||
| *******************************************************************************/ | ||
| package melnorme.lang.ide.core.engine; | ||
|
|
||
| import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull; | ||
|
|
||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.Future; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| import melnorme.lang.ide.core.LangCore; | ||
| import melnorme.lang.ide.core.utils.CoreExecutors; | ||
| import melnorme.utilbox.concurrency.ExecutorTaskAgent; | ||
| import melnorme.utilbox.concurrency.OperationCancellation; | ||
| import melnorme.utilbox.core.CommonException; | ||
| import melnorme.utilbox.misc.Location; | ||
|
|
||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.core.runtime.IProgressMonitor; | ||
|
|
||
| public abstract class EngineOperation<RET> { | ||
|
|
||
| protected final EngineClient engineClient; | ||
|
|
||
| protected final Location location; | ||
| protected final int offset; | ||
| protected final int timeoutMillis; | ||
| protected final String opName; | ||
|
|
||
| public EngineOperation(EngineClient client, Location location, int offset, int timeoutMillis, | ||
| String opName) { | ||
| this.engineClient = client; | ||
|
|
||
| this.location = location; | ||
| this.offset = offset; | ||
| this.timeoutMillis = timeoutMillis; | ||
| this.opName = assertNotNull(opName); | ||
| } | ||
|
|
||
| public RET runEngineOperation(final IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation { | ||
|
|
||
| if(timeoutMillis <= 0 ) { | ||
| // Run directly | ||
| return doRunEngineOperation(pm); | ||
| } | ||
|
|
||
| /* FIXME: should use a cached thread pool? */ | ||
| ExecutorTaskAgent completionExecutor = CoreExecutors.newExecutorTaskAgent(opName + " - Executor"); | ||
|
|
||
| Future<RET> future = completionExecutor.submit(new Callable<RET>() { | ||
| @Override | ||
| public RET call() throws CommonException, CoreException, OperationCancellation { | ||
| return doRunEngineOperation(pm); | ||
| } | ||
| }); | ||
|
|
||
| try { | ||
| return future.get(timeoutMillis, TimeUnit.MILLISECONDS); | ||
| } catch(ExecutionException e) { | ||
| if(e.getCause() instanceof CoreException) { | ||
| throw (CoreException) e.getCause(); | ||
| } | ||
| if(e.getCause() instanceof OperationCancellation) { | ||
| throw (OperationCancellation) e.getCause(); | ||
| } | ||
| if(e.getCause() instanceof CommonException) { | ||
| throw (CommonException) e.getCause(); | ||
| } | ||
|
|
||
| throw LangCore.createCoreException("Error performing " + opName + ".", e.getCause()); | ||
| } catch (TimeoutException e) { | ||
| throw LangCore.createCoreException("Timeout performing " + opName + ".", null); | ||
| } catch (InterruptedException e) { | ||
| throw LangCore.createCoreException("Interrupted.", e); | ||
| } finally { | ||
| completionExecutor.shutdown(); | ||
| } | ||
| } | ||
|
|
||
| protected RET doRunEngineOperation(final IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation { | ||
| engineClient.awaitUpdatedWorkingCopy(location, pm); | ||
|
|
||
| return doRunOperationWithWorkingCopy(pm); | ||
| } | ||
|
|
||
| protected abstract RET doRunOperationWithWorkingCopy(IProgressMonitor pm) | ||
| throws CommonException, CoreException, OperationCancellation; | ||
|
|
||
| } |
Oops, something went wrong.