diff options
author | Nathan Harmata <nharmata@google.com> | 2016-01-19 20:40:37 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2016-01-20 11:35:35 +0000 |
commit | 085c1a1d95dd80f26f4a46c3d4d486427bb24d83 (patch) | |
tree | a5fcaafafe96bb0a46c26ea567cff75ea865b208 /src/main/java/com/google/devtools | |
parent | d655fcd971948125ddc15799ac3a38989c7c3c3a (diff) |
Allow opaque OptionsClassProvider to be passed around in BuildDriver#meta et all so that custom implementations can have custom options passed around.
--
MOS_MIGRATED_REVID=112502778
Diffstat (limited to 'src/main/java/com/google/devtools')
4 files changed, 11 insertions, 5 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 1bae0b7276..517a33f679 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 @@ -138,6 +138,7 @@ import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import com.google.devtools.build.skyframe.WalkableGraph; import com.google.devtools.build.skyframe.WalkableGraph.WalkableGraphFactory; +import com.google.devtools.common.options.OptionsClassProvider; import java.io.IOException; import java.io.PrintStream; @@ -1464,9 +1465,9 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { * Get metadata related to the prepareAndGet() lookup. Resulting data is specific to the * underlying evaluation implementation. */ - public String prepareAndGetMetadata(Collection<String> patterns, String offset) - throws AbruptExitException, InterruptedException { - return buildDriver.meta(ImmutableList.of(getUniverseKey(patterns, offset))); + public String prepareAndGetMetadata(Collection<String> patterns, String offset, + OptionsClassProvider options) throws AbruptExitException, InterruptedException { + return buildDriver.meta(ImmutableList.of(getUniverseKey(patterns, offset)), options); } @Override diff --git a/src/main/java/com/google/devtools/build/skyframe/BUILD b/src/main/java/com/google/devtools/build/skyframe/BUILD index f89eb51c19..19a32a0bc3 100644 --- a/src/main/java/com/google/devtools/build/skyframe/BUILD +++ b/src/main/java/com/google/devtools/build/skyframe/BUILD @@ -14,6 +14,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/main/java/com/google/devtools/common/options", "//third_party:guava", "//third_party:jsr305", ], diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java b/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java index a63afc71d8..6fe62ec8a6 100644 --- a/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java +++ b/src/main/java/com/google/devtools/build/skyframe/BuildDriver.java @@ -16,6 +16,7 @@ package com.google.devtools.build.skyframe; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.AbruptExitException; +import com.google.devtools.common.options.OptionsClassProvider; import javax.annotation.Nullable; @@ -35,7 +36,9 @@ public interface BuildDriver { * Retrieve metadata about the computation over the given roots. Data returned is specific to the * underlying evaluator implementation. */ - String meta(Iterable<SkyKey> roots) throws AbruptExitException, InterruptedException; + String meta(Iterable<SkyKey> roots, OptionsClassProvider options) + throws AbruptExitException, InterruptedException; + MemoizingEvaluator getGraphForTesting(); diff --git a/src/main/java/com/google/devtools/build/skyframe/SequentialBuildDriver.java b/src/main/java/com/google/devtools/build/skyframe/SequentialBuildDriver.java index 8f76b15e26..99e2ef05f7 100644 --- a/src/main/java/com/google/devtools/build/skyframe/SequentialBuildDriver.java +++ b/src/main/java/com/google/devtools/build/skyframe/SequentialBuildDriver.java @@ -15,6 +15,7 @@ package com.google.devtools.build.skyframe; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Preconditions; +import com.google.devtools.common.options.OptionsClassProvider; import javax.annotation.Nullable; @@ -42,7 +43,7 @@ public class SequentialBuildDriver implements BuildDriver { } @Override - public String meta(Iterable<SkyKey> of) { + public String meta(Iterable<SkyKey> of, OptionsClassProvider options) { return ""; } |