diff options
author | 2015-09-23 16:33:42 +0000 | |
---|---|---|
committer | 2015-09-24 14:17:16 +0000 | |
commit | 590ba0abea8eff418978d4ef183110d4605a5008 (patch) | |
tree | 9acc73749570ff0b77881e98c1eb33815dda834b /src | |
parent | a385ab9705b0bd04c48010f86c4120bacc48b9f3 (diff) |
Pass the SkyframePackageManager to the cycle reporters, not LoadedPackageP.
This is in preparation for removing LoadedPackageProvider.
--
MOS_MIGRATED_REVID=103752960
Diffstat (limited to 'src')
5 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AbstractLabelCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/AbstractLabelCycleReporter.java index 2903e8bbeb..fa2e4b42e7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AbstractLabelCycleReporter.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AbstractLabelCycleReporter.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.NoSuchThingException; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.skyframe.CycleInfo; import com.google.devtools.build.skyframe.CyclesReporter; import com.google.devtools.build.skyframe.SkyKey; @@ -30,9 +29,9 @@ import com.google.devtools.build.skyframe.SkyKey; /** Reports cycles between skyframe values whose keys contains {@link Label}s. */ abstract class AbstractLabelCycleReporter implements CyclesReporter.SingleCycleReporter { - private final LoadedPackageProvider loadedPackageProvider; + private final SkyframePackageManager loadedPackageProvider; - AbstractLabelCycleReporter(LoadedPackageProvider loadedPackageProvider) { + AbstractLabelCycleReporter(SkyframePackageManager loadedPackageProvider) { this.loadedPackageProvider = loadedPackageProvider; } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java index 7b84181d82..5ea795df03 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java @@ -20,7 +20,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.analysis.LabelAndConfiguration; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.lib.skyframe.ArtifactValue.OwnedArtifact; import com.google.devtools.build.skyframe.CycleInfo; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -36,7 +35,7 @@ public class ActionArtifactCycleReporter extends AbstractLabelCycleReporter { SkyFunctions.isSkyFunction(SkyFunctions.ACTION_EXECUTION), SkyFunctions.isSkyFunction(SkyFunctions.TARGET_COMPLETION)); - ActionArtifactCycleReporter(LoadedPackageProvider loadedPackageProvider) { + ActionArtifactCycleReporter(SkyframePackageManager loadedPackageProvider) { super(loadedPackageProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java index 6341e60f20..0f780d4227 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java @@ -17,7 +17,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.skyframe.CycleInfo; import com.google.devtools.build.skyframe.SkyKey; @@ -34,7 +33,7 @@ class ConfiguredTargetCycleReporter extends AbstractLabelCycleReporter { private static final Predicate<SkyKey> IS_CONFIGURED_TARGET_SKY_KEY = SkyFunctions.isSkyFunction(SkyFunctions.CONFIGURED_TARGET); - ConfiguredTargetCycleReporter(LoadedPackageProvider loadedPackageProvider) { + ConfiguredTargetCycleReporter(SkyframePackageManager loadedPackageProvider) { super(loadedPackageProvider); } 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 8e74239d05..74f3bd4391 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 @@ -212,7 +212,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { private MutableSupplier<UUID> buildId = new MutableSupplier<>(); protected boolean active = true; - private final PackageManager packageManager; + private final SkyframePackageManager packageManager; private final Preprocessor.Factory.Supplier preprocessorFactorySupplier; private Preprocessor.Factory preprocessorFactory; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetCycleReporter.java index ef6dc6035e..f1d5d3e517 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetCycleReporter.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetCycleReporter.java @@ -20,7 +20,6 @@ import com.google.common.collect.Lists; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.PackageGroup; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.skyframe.CycleInfo; import com.google.devtools.build.skyframe.SkyKey; @@ -35,7 +34,7 @@ class TransitiveTargetCycleReporter extends AbstractLabelCycleReporter { private static final Predicate<SkyKey> IS_TRANSITIVE_TARGET_SKY_KEY = SkyFunctions.isSkyFunction(SkyFunctions.TRANSITIVE_TARGET); - TransitiveTargetCycleReporter(LoadedPackageProvider loadedPackageProvider) { + TransitiveTargetCycleReporter(SkyframePackageManager loadedPackageProvider) { super(loadedPackageProvider); } |