diff options
author | janakr <janakr@google.com> | 2018-06-13 21:57:19 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-13 21:58:58 -0700 |
commit | b9d8d58ef58645544c84ac4bcace869adad7abe5 (patch) | |
tree | f4faa461747d1e96b299ed67a3f520679d5481b2 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java | |
parent | 594e8588bcd0257c5a3c7e1dd8eae82ce28173b2 (diff) |
Add functionality to make certain SkyValues unshareable, meaning they are not serialized. Tag TestCompletionValue and any ActionExecutionValue coming from a NotifyOnActionCacheHit (i.e., tests) like that. To make such values really not shared, request the ActionExecutionValue from TestCompletionFunction as opposed to the ArtifactValue (propagating the unshareable bit up seemed like too much fuss, and I have a dream of getting rid of ArtifactValue anyway).
PiperOrigin-RevId: 200504358
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 61c31d8761..c515163f27 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 @@ -765,11 +765,12 @@ public final class SkyframeActionExecutor { + " in an action which is not a SkyframeAwareAction. Action: %s\n symlinks:%s", action, actionExecutionContext.getOutputSymlinks()); - return new ActionExecutionValue( + return ActionExecutionValue.create( metadataHandler.getOutputArtifactData(), metadataHandler.getOutputTreeArtifactData(), metadataHandler.getAdditionalOutputData(), - actionExecutionContext.getOutputSymlinks()); + actionExecutionContext.getOutputSymlinks(), + action instanceof NotifyOnActionCacheHit); } } } |