diff options
author | Googler <noreply@google.com> | 2017-08-02 16:58:05 +0200 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-08-03 12:09:50 +0200 |
commit | 2dac5f935c3de2611c69c84dc5394d47d8145591 (patch) | |
tree | d45e105419ebba4aa90868cfbb2af262ab93dd69 /src/main/java/com/google | |
parent | f6316bf122ff09753c3bfb7e48faae855731091f (diff) |
Refactor SkyframeExecutor to allow computing universal key through static method
RELNOTES: None
PiperOrigin-RevId: 163979668
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index cfbcd5d93c..496e83b165 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java @@ -289,7 +289,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { private final RuleClassProvider ruleClassProvider; private final CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy; - + private final List<BuildFileName> buildFilesByPriority; private final ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile; @@ -600,9 +600,13 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { progressReceiver = newSkyframeProgressReceiver(); ImmutableMap<SkyFunctionName, SkyFunction> skyFunctions = skyFunctions(pkgFactory, allowedMissingInputs); - memoizingEvaluator = evaluatorSupplier.create( - skyFunctions, evaluatorDiffer(), progressReceiver, emittedEventState, - hasIncrementalState()); + memoizingEvaluator = + evaluatorSupplier.create( + skyFunctions, + evaluatorDiffer(), + progressReceiver, + emittedEventState, + hasIncrementalState()); buildDriver = getBuildDriver(); } @@ -1774,6 +1778,11 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { @Override public SkyKey getUniverseKey(Collection<String> patterns, String offset) { + return computeUniverseKey(ImmutableList.copyOf(patterns), offset); + } + + /** Computes the {@link SkyKey} that defines this universe. */ + public static SkyKey computeUniverseKey(Collection<String> patterns, String offset) { return PrepareDepsOfPatternsValue.key(ImmutableList.copyOf(patterns), offset); } |