diff options
author | 2017-08-17 20:50:22 +0200 | |
---|---|---|
committer | 2017-08-18 09:01:36 +0200 | |
commit | 8b4f9f51f664c722f76d224a4d19c41d10cd20b7 (patch) | |
tree | e26ccae968920fefeae375b19f1e27be85dea844 /src/main/java/com/google/devtools/build/lib/analysis/config | |
parent | e4bdbe7fd4c5be7ff6bf44468d7a5c2d9e6f2299 (diff) |
Remove ConfigurationCollection{Function,Value}, BuildConfigurationCollection.Transitions.
Part of the static config cleanup effort.
PiperOrigin-RevId: 165607492
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config')
3 files changed, 5 insertions, 257 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index 6f97280f50..c5f59d6e8e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Interner; import com.google.common.collect.Interners; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.MutableClassToInstanceMap; @@ -41,7 +40,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.Dependency; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.FileWriteAction; -import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection.Transitions; import com.google.devtools.build.lib.buildeventstream.BuildEvent; import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; import com.google.devtools.build.lib.buildeventstream.BuildEventId; @@ -1096,7 +1094,6 @@ public final class BuildConfiguration implements BuildEvent { private final String checksum; - private Transitions transitions; private Set<BuildConfiguration> allReachableConfigurations; private final ImmutableMap<Class<? extends Fragment>, Fragment> fragments; @@ -1599,22 +1596,6 @@ public final class BuildConfiguration implements BuildEvent { } /** - * Set the outgoing configuration transitions. During the lifetime of a given build configuration, - * this must happen exactly once, shortly after the configuration is created. - */ - public void setConfigurationTransitions(Transitions transitions) { - // TODO(bazel-team): This method makes the object mutable - get rid of it. Dynamic - // configurations should eventually make this obsolete. - Preconditions.checkNotNull(transitions); - Preconditions.checkState(this.transitions == null); - this.transitions = transitions; - } - - public Transitions getTransitions() { - return transitions; - } - - /** * For static configurations, returns all configurations that can be reached from this one through * any kind of configuration transition. * @@ -1642,39 +1623,11 @@ public final class BuildConfiguration implements BuildEvent { if (!result.add(config)) { continue; } - config.getTransitions().addDirectlyReachableConfigurations(queue); } return result; } /** - * Returns the new configuration after traversing a dependency edge with a given configuration - * transition. - * - * @param transition the configuration transition - * @return the new configuration - * @throws IllegalArgumentException if the transition is a {@link SplitTransition} - * - * TODO(bazel-team): remove this as part of the static -> dynamic configuration migration - */ - public BuildConfiguration getConfiguration(Transition transition) { - Preconditions.checkArgument(!(transition instanceof SplitTransition)); - // The below call precondition-checks we're indeed using static configurations. - return transitions.getStaticConfiguration(transition); - } - - /** - * Returns the new configurations after traversing a dependency edge with a given split - * transition. - * - * @param transition the split configuration transition - * @return the new configurations - */ - public List<BuildConfiguration> getSplitConfigurations(SplitTransition<?> transition) { - return transitions.getSplitConfigurations(transition); - } - - /** * A common interface for static vs. dynamic configuration implementations that allows * common configuration and transition-selection logic to seamlessly work with either. * @@ -1707,8 +1660,7 @@ public final class BuildConfiguration implements BuildEvent { void applyAttributeConfigurator(Configurator<BuildOptions> configurator); /** - * Calls {@link Transitions#configurationHook} on the current configuration(s) represent by - * this instance. + * Applies a custom configuration hook for the given rule. */ void applyConfigurationHook(Rule fromRule, Attribute attribute, Target toTarget); @@ -1739,23 +1691,12 @@ public final class BuildConfiguration implements BuildEvent { @Override public void applyTransition(Transition transition) { - if (transition == Attribute.ConfigurationTransition.NULL) { - toConfigurations = Lists.<BuildConfiguration>asList(null, new BuildConfiguration[0]); - } else { - ImmutableList.Builder<BuildConfiguration> newConfigs = ImmutableList.builder(); - for (BuildConfiguration currentConfig : toConfigurations) { - newConfigs.add(currentConfig.getTransitions().getStaticConfiguration(transition)); - } - toConfigurations = newConfigs.build(); - } + throw new UnsupportedOperationException("dead static config code being removed"); } @Override public void split(SplitTransition<BuildOptions> splitTransition) { - // Split transitions can't be nested, so if we're splitting we must be doing it over - // a single config. - toConfigurations = - Iterables.getOnlyElement(toConfigurations).getSplitConfigurations(splitTransition); + throw new UnsupportedOperationException("dead static config code being removed"); } @Override @@ -1775,18 +1716,7 @@ public final class BuildConfiguration implements BuildEvent { @Override public void applyConfigurationHook(Rule fromRule, Attribute attribute, Target toTarget) { - ImmutableList.Builder<BuildConfiguration> toConfigs = ImmutableList.builder(); - for (BuildConfiguration currentConfig : toConfigurations) { - // BuildConfigurationCollection.configurationHook can apply further transitions. We want - // those transitions to only affect currentConfig (not everything in toConfigurations), so - // we use a delegate bound to only that config. - StaticTransitionApplier delegate = new StaticTransitionApplier(currentConfig); - currentConfig.getTransitions().configurationHook(fromRule, attribute, toTarget, delegate); - currentConfig = Iterables.getOnlyElement(delegate.toConfigurations); - - toConfigs.add(currentConfig); - } - toConfigurations = toConfigs.build(); + throw new UnsupportedOperationException("dead static config code being removed"); } @Override @@ -2583,8 +2513,6 @@ public final class BuildConfiguration implements BuildEvent { /** * Returns the transition that produces the "artifact owner" for this configuration, or null * if this configuration is its own owner. - * - * <p>This is the dynamic configuration version of {@link #getArtifactOwnerConfiguration}. */ @Nullable public PatchTransition getArtifactOwnerTransition() { @@ -2606,16 +2534,6 @@ public final class BuildConfiguration implements BuildEvent { } /** - * See {@code BuildConfigurationCollection.Transitions.getArtifactOwnerConfiguration()}. - * - * <p>This is the static configuration version of {@link #getArtifactOwnerTransition}. - */ - public BuildConfiguration getArtifactOwnerConfiguration() { - Preconditions.checkState(!useDynamicConfigurations()); - return transitions.getArtifactOwnerConfiguration(); - } - - /** * @return the list of default features used for all packages. */ public List<String> getDefaultFeatures() { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java index 1edbc0dfed..72a9e3d87d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java @@ -15,23 +15,12 @@ package com.google.devtools.build.lib.analysis.config; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ListMultimap; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; -import com.google.devtools.build.lib.packages.Attribute; -import com.google.devtools.build.lib.packages.Attribute.SplitTransition; -import com.google.devtools.build.lib.packages.Attribute.Transition; -import com.google.devtools.build.lib.packages.Rule; -import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.util.Preconditions; -import java.io.PrintStream; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; @@ -72,14 +61,6 @@ public final class BuildConfigurationCollection { } } - public static BuildConfiguration configureTopLevelTarget(BuildConfiguration topLevelConfiguration, - Target toTarget) { - if (!toTarget.isConfigurable()) { - return null; - } - return topLevelConfiguration.getTransitions().toplevelConfigurationHook(toTarget); - } - public ImmutableList<BuildConfiguration> getTargetConfigurations() { return targetConfigurations; } @@ -136,157 +117,6 @@ public final class BuildConfigurationCollection { } /** - * Prints the configuration graph in dot format to the given print stream. This is only intended - * for debugging. - */ - public void dumpAsDotGraph(PrintStream out) { - out.println("digraph g {"); - out.println(" ratio = 0.3;"); - for (BuildConfiguration config : getAllConfigurations()) { - String from = config.checksum(); - for (Map.Entry<? extends Transition, ConfigurationHolder> entry : - config.getTransitions().getTransitionTable().entrySet()) { - BuildConfiguration toConfig = entry.getValue().getConfiguration(); - if (toConfig == config) { - continue; - } - String to = toConfig == null ? "ERROR" : toConfig.checksum(); - out.println(" \"" + from + "\" -> \"" + to + "\" [label=\"" + entry.getKey() + "\"]"); - } - } - out.println("}"); - } - - /** - * The outgoing transitions for a build configuration. - */ - public abstract static class Transitions implements Serializable { - protected final BuildConfiguration configuration; - - /** - * Look up table for the configuration transitions, i.e., HOST, DATA, etc. - */ - private final Map<? extends Transition, ConfigurationHolder> transitionTable; - - // TODO(bazel-team): Consider merging transitionTable into this. - private final ListMultimap<? super SplitTransition<?>, BuildConfiguration> splitTransitionTable; - - public Transitions(BuildConfiguration configuration, - Map<? extends Transition, ConfigurationHolder> transitionTable, - ListMultimap<? extends SplitTransition<?>, BuildConfiguration> splitTransitionTable) { - Preconditions.checkState(!configuration.useDynamicConfigurations(), - "Dynamic configurations don't use this class and static configurations are going away. " - + "Anything added here is dead code. Contact Blaze developers if you need help."); - - this.configuration = configuration; - this.transitionTable = ImmutableMap.copyOf(transitionTable); - this.splitTransitionTable = ImmutableListMultimap.copyOf(splitTransitionTable); - } - - public Map<? extends Transition, ConfigurationHolder> getTransitionTable() { - return transitionTable; - } - - public List<BuildConfiguration> getSplitConfigurationsNoSelf(SplitTransition<?> transition) { - if (splitTransitionTable.containsKey(transition)) { - return splitTransitionTable.get(transition); - } else { - return ImmutableList.of(); - } - } - - public List<BuildConfiguration> getSplitConfigurations(SplitTransition<?> transition) { - if (splitTransitionTable.containsKey(transition)) { - return splitTransitionTable.get(transition); - } else { - Preconditions.checkState(transition.defaultsToSelf()); - return ImmutableList.of(configuration); - } - } - - /** - * Adds all configurations that are directly reachable from this configuration through - * any kind of configuration transition. - */ - public void addDirectlyReachableConfigurations(Collection<BuildConfiguration> queue) { - for (ConfigurationHolder holder : transitionTable.values()) { - if (holder.configuration != null) { - queue.add(holder.configuration); - } - } - queue.addAll(splitTransitionTable.values()); - } - - /** - * Artifacts need an owner in Skyframe. By default it's the same configuration as what - * the configured target has, but it can be overridden if necessary. - * - * @return the artifact owner configuration - */ - public BuildConfiguration getArtifactOwnerConfiguration() { - return configuration; - } - - /** - * Returns the new configuration after traversing a dependency edge with a - * given configuration transition. - * - * <p>Only used for static configuration builds. - * - * @param configurationTransition the configuration transition - * @return the new configuration - */ - public BuildConfiguration getStaticConfiguration(Transition configurationTransition) { - Preconditions.checkState(!configuration.useDynamicConfigurations()); - ConfigurationHolder holder = transitionTable.get(configurationTransition); - if (holder == null && configurationTransition.defaultsToSelf()) { - return configuration; - } - return holder.configuration; - } - - /** - * Translates a static configuration {@link Transition} reference into the corresponding - * dynamic configuration transition. - * - * <p>The difference is that with static configurations, the transition just models a desired - * type of transition that subsequently gets linked to a pre-built global configuration through - * custom logic in {@link BuildConfigurationCollection.Transitions} and - * {@link com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory}. - * - * <p>With dynamic configurations, the transition directly embeds the semantics, e.g. - * it includes not just a name but also the logic of how it should transform its input - * configuration. - * - * <p>This is a connecting method meant to keep the two models in sync for the current time - * in which they must co-exist. Once dynamic configurations are production-ready, we'll remove - * the static configuration code entirely. - */ - @Deprecated - public Transition getDynamicTransition(Transition transition) { - // Keep this interface for now because some other dead code is still calling it. - throw new UnsupportedOperationException( - "This interface is no longer supported and will be removed soon."); - } - - /** - * Arbitrary configuration transitions can be implemented by overriding this hook. - */ - @SuppressWarnings("unused") - public void configurationHook(Rule fromTarget, Attribute attribute, Target toTarget, - BuildConfiguration.TransitionApplier transitionApplier) { - } - - /** - * Associating configurations to top-level targets can be implemented by overriding this hook. - */ - @SuppressWarnings("unused") - public BuildConfiguration toplevelConfigurationHook(Target toTarget) { - return configuration; - } - } - - /** * A holder class for {@link BuildConfiguration} instances that allows {@code null} values, * because none of the Table implementations allow them. */ diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java index ecbefd229e..5a950839a7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java @@ -32,7 +32,7 @@ public interface PackageProviderForConfigurations { /** * Adds dependency to fileName if needed. Used only in skyframe, for creating correct dependencies - * for {@link com.google.devtools.build.lib.skyframe.ConfigurationCollectionValue}. + * for {@link com.google.devtools.build.lib.skyframe.ConfigurationFragmentValue}. */ void addDependency(Package pkg, String fileName) throws LabelSyntaxException, IOException, InterruptedException; |