diff options
| author |  ulfjack <ulfjack@google.com> | 2017-06-19 14:17:52 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-06-19 18:25:13 +0200 |
| commit | 77c9f5ec751f4adf3a8095e2e2943ec59dc12d26 (patch) | |
| tree | e26c02e39bbec73d4fdc47edbbfa7469fa0f291d /src/main/java/com/google/devtools/build/lib/standalone | |
| parent | 34e22458c6058773b41958b75ef5e7459482c109 (diff) | |
Rewrite the Executor/ActionExecutionContext split
Move everything to ActionExecutionContext, and drop Executor whereever possible.
This clarifies the API, makes it simpler to test, and simplifies the code.
PiperOrigin-RevId: 159414816
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/standalone')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java index de47fe42d2..886fa45a33 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.actions.ActionInputFileCache; import com.google.devtools.build.lib.actions.ActionStatusMessage; import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.ExecutionStrategy; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnActionContext; @@ -78,7 +77,7 @@ public class StandaloneSpawnStrategy implements SpawnActionContext { public void exec(final Spawn spawn, final ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException { final int timeoutSeconds = Spawns.getTimeoutSeconds(spawn); - final EventBus eventBus = actionExecutionContext.getExecutor().getEventBus(); + final EventBus eventBus = actionExecutionContext.getEventBus(); SpawnExecutionPolicy policy = new SpawnExecutionPolicy() { @Override public ActionInputFileCache getActionInputFileCache() { @@ -107,7 +106,7 @@ public class StandaloneSpawnStrategy implements SpawnActionContext { spawn, actionExecutionContext.getArtifactExpander(), actionExecutionContext.getActionInputFileCache(), - actionExecutionContext.getExecutor().getContext(FilesetActionContext.class)); + actionExecutionContext.getContext(FilesetActionContext.class)); } @Override @@ -127,9 +126,8 @@ public class StandaloneSpawnStrategy implements SpawnActionContext { } }; - Executor executor = actionExecutionContext.getExecutor(); - if (executor.reportsSubcommands()) { - executor.reportSubcommand(spawn); + if (actionExecutionContext.reportsSubcommands()) { + actionExecutionContext.reportSubcommand(spawn); } try { |