Skip to content

Commit

Permalink
Remove dead code from ActionGraphDump.
Browse files Browse the repository at this point in the history
Remove the optional query and flag to include param files -- they are both never used.

PiperOrigin-RevId: 381324065
  • Loading branch information
alexjski authored and copybara-github committed Jun 24, 2021
1 parent 7dd6ced commit 2b778ea
Showing 1 changed file with 1 addition and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,13 @@
import com.google.devtools.build.lib.analysis.AspectValue;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.ConfiguredTargetValue;
import com.google.devtools.build.lib.analysis.actions.ParameterFileWriteAction;
import com.google.devtools.build.lib.analysis.actions.SpawnAction;
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
import com.google.devtools.build.lib.buildeventstream.BuildEvent;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.query2.aquery.AqueryActionFilter;
import com.google.devtools.build.lib.query2.aquery.AqueryUtils;
import com.google.devtools.build.lib.skyframe.RuleConfiguredTargetValue;
import com.google.devtools.build.lib.util.Pair;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -53,42 +49,21 @@ public class ActionGraphDump {
private final ActionKeyContext actionKeyContext = new ActionKeyContext();
private final Set<String> actionGraphTargets;

private final KnownRuleClassStrings knownRuleClassStrings;
private final KnownArtifacts knownArtifacts;
private final KnownConfigurations knownConfigurations;
private final KnownNestedSets knownNestedSets;
private final KnownAspectDescriptors knownAspectDescriptors;
private final KnownTargets knownTargets;
private final AqueryActionFilter actionFilters;
private final boolean includeActionCmdLine;
private final boolean includeArtifacts;
private final boolean includeParamFiles;

private Map<String, Iterable<String>> paramFileNameToContentMap;

public ActionGraphDump(
List<String> actionGraphTargets, boolean includeActionCmdLine, boolean includeArtifacts) {
this(
actionGraphTargets,
includeActionCmdLine,
includeArtifacts,
/* actionFilters= */ AqueryActionFilter.emptyInstance(),
/* includeParamFiles */ false);
}

public ActionGraphDump(
List<String> actionGraphTargets,
boolean includeActionCmdLine,
boolean includeArtifacts,
AqueryActionFilter actionFilters,
boolean includeParamFiles) {
this.actionGraphTargets = ImmutableSet.copyOf(actionGraphTargets);
this.includeActionCmdLine = includeActionCmdLine;
this.includeArtifacts = includeArtifacts;
this.actionFilters = actionFilters;
this.includeParamFiles = includeParamFiles;

knownRuleClassStrings = new KnownRuleClassStrings(actionGraphBuilder);
KnownRuleClassStrings knownRuleClassStrings = new KnownRuleClassStrings(actionGraphBuilder);
knownArtifacts = new KnownArtifacts(actionGraphBuilder);
knownConfigurations = new KnownConfigurations(actionGraphBuilder);
knownNestedSets = new KnownNestedSets(actionGraphBuilder, knownArtifacts);
Expand All @@ -110,20 +85,6 @@ private boolean includeInActionGraph(String labelString) {

private void dumpSingleAction(ConfiguredTarget configuredTarget, ActionAnalysisMetadata action)
throws CommandLineExpansionException, InterruptedException {

// Store the content of param files.
if (includeParamFiles && (action instanceof ParameterFileWriteAction)) {
ParameterFileWriteAction parameterFileWriteAction = (ParameterFileWriteAction) action;

Iterable<String> fileContent = parameterFileWriteAction.getArguments();
String paramFileExecPath = action.getPrimaryOutput().getExecPathString();
getParamFileNameToContentMap().put(paramFileExecPath, fileContent);
}

if (!AqueryUtils.matchesAqueryFilters(action, actionFilters)) {
return;
}

// Dereference any aliases that might be present.
configuredTarget = configuredTarget.getActual();

Expand Down Expand Up @@ -166,23 +127,6 @@ private void dumpSingleAction(ConfiguredTarget configuredTarget, ActionAnalysisM
actionBuilder.addAllArguments(commandAction.getArguments());
}

// Include the content of param files in output.
if (includeParamFiles) {
// Assumption: if an Action takes a params file as an input, it will be used
// to provide params to the command.
for (Artifact input : action.getInputs().toList()) {
String inputFileExecPath = input.getExecPathString();
if (getParamFileNameToContentMap().containsKey(inputFileExecPath)) {
AnalysisProtos.ParamFile paramFile =
AnalysisProtos.ParamFile.newBuilder()
.setExecPath(inputFileExecPath)
.addAllArguments(getParamFileNameToContentMap().get(inputFileExecPath))
.build();
actionBuilder.addParamFiles(paramFile);
}
}
}

Map<String, String> executionInfo = action.getExecutionInfo();
if (executionInfo != null) {
for (Map.Entry<String, String> info : executionInfo.entrySet()) {
Expand Down Expand Up @@ -249,12 +193,4 @@ public void dumpConfiguredTarget(RuleConfiguredTargetValue configuredTargetValue
public ActionGraphContainer build() {
return actionGraphBuilder.build();
}

/** Lazy initialization of paramFileNameToContentMap. */
private Map<String, Iterable<String>> getParamFileNameToContentMap() {
if (paramFileNameToContentMap == null) {
paramFileNameToContentMap = new HashMap<>();
}
return paramFileNameToContentMap;
}
}

0 comments on commit 2b778ea

Please sign in to comment.