diff options
author | 2017-02-28 10:46:53 +0000 | |
---|---|---|
committer | 2017-02-28 11:33:55 +0000 | |
commit | 5ea2b14a9cece2e42779a8b3e4e8f3483e991ee1 (patch) | |
tree | ce979a2de599144bc8f6b33a48f2e7b562e7ca81 /src/main/java/com/google/devtools/build/lib/skyframe | |
parent | 8afbd3c65339665992ece415e268955394507559 (diff) |
Clean up the semantics of input discovering actions a bit by making updateInputs() and inputsKnown() non-overridable and removing setInputs().
This comes at the cost of adding a flag to every action instance that's not used for non-input-discovering actions, but I think that's a deal. Simpler APIs are good, mmmmkay?
Also fixed a few pre-existing issues in TestAction and ObjcCompileAction.
--
PiperOrigin-RevId: 148749734
MOS_MIGRATED_REVID=148749734
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java index 538ef90008..905c3a93cf 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java @@ -227,7 +227,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver throws ActionExecutionFunctionException, InterruptedException { Iterable<Artifact> allKnownInputs = Iterables.concat( action.getInputs(), action.getRunfilesSupplier().getArtifacts()); - if (action.inputsKnown()) { + if (action.inputsDiscovered()) { return new AllInputs(allKnownInputs); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java index c122f3b1ee..1d23376469 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java @@ -798,7 +798,7 @@ public final class SkyframeActionExecutor implements ActionExecutionContextFacto private void completeAction(Action action, MetadataHandler metadataHandler, FileOutErr fileOutErr, boolean outputAlreadyDumped) throws ActionExecutionException { try { - Preconditions.checkState(action.inputsKnown(), + Preconditions.checkState(action.inputsDiscovered(), "Action %s successfully executed, but inputs still not known", action); profiler.startTask(ProfilerTask.ACTION_COMPLETE, action); |