Remove all the action resource estimation code
--
PiperOrigin-RevId: 149110466
MOS_MIGRATED_REVID=149110466
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Action.java b/src/main/java/com/google/devtools/build/lib/actions/Action.java
index 5346817..d490e6a 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Action.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Action.java
@@ -181,17 +181,6 @@
void updateInputs(Iterable<Artifact> inputs);
/**
- * Return a best-guess estimate of the operation's resource consumption on the
- * local host itself for use in scheduling.
- *
- * @param executor the application-specific value passed to the
- * executor parameter of the top-level call to
- * Builder.buildArtifacts().
- */
- @Deprecated // TODO(ulfjack): Remove this.
- @Nullable ResourceSet estimateResourceConsumption(Executor executor);
-
- /**
* Returns true if the output should bypass output filtering. This is used for test actions.
*/
boolean showsOutputUnconditionally();
diff --git a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
index 15d01bd..8d46ef1 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
@@ -46,11 +46,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
return GUID;
}
diff --git a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
index a8a91f6..a42d5b9 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java
@@ -57,11 +57,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
// TODO(bazel-team): Need to take middlemanType into account here.
// Only the set of inputs matters, and the dependency checker is
diff --git a/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java b/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
index e0deb85..8dbf939 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
@@ -24,17 +24,6 @@
throws ExecException, InterruptedException;
/**
- * Passing a spawns remotable flag to this method returns whether the spawn will actually be
- * executed remotely.
- *
- * <p>This implements a tri-state mode. There are three possible cases: (1) implementations of
- * this class can unconditionally execute spawns locally, (2) they can follow whatever is set for
- * the corresponding spawn (see {@link Spawn#isRemotable}), or (3) they can unconditionally
- * execute spawns remotely, i.e., force remote execution.
- */
- boolean willExecuteRemotely(boolean remotable);
-
- /**
* If an ExecException should be rethrown by the strategy that executed this.
* Currently only works for LinuxSandboxedStrategy:
* If true, will throw ExecException and give reproduction instruction for sandbox.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
index eb2115a..4b3f81e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PseudoAction.java
@@ -19,14 +19,11 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.extra.ExtraActionInfo;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.protobuf.GeneratedMessage.GeneratedExtension;
import com.google.protobuf.MessageLite;
-
import java.util.Collection;
import java.util.UUID;
@@ -72,11 +69,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public ExtraActionInfo.Builder getExtraActionInfo() {
return super.getExtraActionInfo().setExtension(infoExtension, info);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java
index 7545d34..ad69562 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java
@@ -23,9 +23,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.cmdline.Label;
-
import java.io.IOException;
import java.io.OutputStream;
@@ -85,19 +83,6 @@
protected void afterWrite(Executor executor) {
}
- // We're mainly doing I/O, so estimate very low CPU usage, e.g. 1%. Just a guess.
- private static final ResourceSet DEFAULT_FILEWRITE_LOCAL_ACTION_RESOURCE_SET =
- ResourceSet.createWithRamCpuIo(/*memoryMb=*/0.0, /*cpuUsage=*/0.01, /*ioUsage=*/0.2);
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return executor.getContext(FileWriteActionContext.class).estimateResourceConsumption(this);
- }
-
- public ResourceSet estimateResourceConsumptionLocal() {
- return DEFAULT_FILEWRITE_LOCAL_ACTION_RESOURCE_SET;
- }
-
@Override
public String getMnemonic() {
return "FileWrite";
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java
index 2ddd813..d2069cd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java
@@ -16,7 +16,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor.ActionContext;
-import com.google.devtools.build.lib.actions.ResourceSet;
/**
* The action context for {@link AbstractFileWriteAction} instances (technically instances of
@@ -29,10 +28,4 @@
*/
void exec(AbstractFileWriteAction action, ActionExecutionContext actionExecutionContext)
throws ExecException, InterruptedException;
-
- /**
- * Returns the estimated resource consumption of the action.
- */
- ResourceSet estimateResourceConsumption(AbstractFileWriteAction action);
-
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java
index ba7da94..67dae4d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java
@@ -32,7 +32,6 @@
import com.google.devtools.build.lib.actions.BaseSpawn;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.RunfilesSupplier;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.actions.SpawnActionContext;
@@ -232,14 +231,6 @@
return true;
}
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- if (getContext(executor).willExecuteRemotely(true)) {
- return ResourceSet.ZERO;
- }
- return AbstractAction.DEFAULT_RESOURCE_SET;
- }
-
private SpawnActionContext getContext(Executor executor) {
return executor.getSpawnActionContext(getMnemonic());
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index 1aa3ea0..ce1316f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -440,15 +440,6 @@
return executor.getSpawnActionContext(getMnemonic());
}
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- SpawnActionContext context = getContext(executor);
- if (context.willExecuteRemotely(!executionInfo.containsKey("local"))) {
- return ResourceSet.ZERO;
- }
- return resourceSet;
- }
-
/**
* A spawn instance that is tied to a specific SpawnAction.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
index 0eda464..20b2266 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java
@@ -21,13 +21,10 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
-
import java.io.IOException;
/**
@@ -99,11 +96,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
Fingerprint f = new Fingerprint();
f.addString(GUID);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
index c376901..a7e82a1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
@@ -20,8 +20,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
@@ -115,11 +113,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public void execute(
ActionExecutionContext actionExecutionContext)
throws ActionExecutionException, InterruptedException {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
index a31f319..58eab6d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
@@ -29,8 +29,6 @@
import com.google.devtools.build.lib.actions.ArtifactFactory;
import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.BuildInfo;
@@ -236,11 +234,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
return "";
}
diff --git a/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java
index 6604cbb..5ae15c5 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java
@@ -19,7 +19,6 @@
import com.google.devtools.build.lib.actions.EnvironmentalExecException;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction;
import com.google.devtools.build.lib.analysis.actions.FileWriteActionContext;
import com.google.devtools.build.lib.profiler.AutoProfiler;
@@ -62,9 +61,4 @@
}
}
}
-
- @Override
- public ResourceSet estimateResourceConsumption(AbstractFileWriteAction action) {
- return action.estimateResourceConsumptionLocal();
- }
}
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
index 6782e2d..c1e3666 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
@@ -289,12 +289,6 @@
}
@Override
- public boolean willExecuteRemotely(boolean remotable) {
- // Returning true here just helps to estimate the cost of this computation is zero.
- return remotable;
- }
-
- @Override
public boolean shouldPropagateExecException() {
return false;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index d1f0e4b..e835609 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -1067,11 +1067,6 @@
return context.getDeclaredIncludeSrcs();
}
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return executor.getContext(actionContext).estimateResourceConsumption(this);
- }
-
@VisibleForTesting
public Class<? extends CppCompileActionContext> getActionContext() {
return actionContext;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java
index 192a789..9038292 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionContext.java
@@ -19,7 +19,6 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor.ActionContext;
-import com.google.devtools.build.lib.actions.ResourceSet;
import java.io.IOException;
import javax.annotation.Nullable;
@@ -44,7 +43,7 @@
* <p>Returns null if additional inputs will only be found during action execution, not before.
*/
@Nullable
- public Iterable<Artifact> findAdditionalInputs(
+ Iterable<Artifact> findAdditionalInputs(
CppCompileAction action,
ActionExecutionContext actionExecutionContext,
IncludeProcessing includeProcessing)
@@ -61,9 +60,4 @@
*/
@Nullable Reply getReplyFromException(
ExecException e, CppCompileAction action);
-
- /**
- * Returns the estimated resource consumption of the action.
- */
- ResourceSet estimateResourceConsumption(CppCompileAction action);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
index 2082192..0fbd2d0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -485,11 +485,6 @@
return (isLTOIndexing ? "LTO indexing " : "Linking ") + linkOutput.prettyPrint();
}
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return executor.getContext(CppLinkActionContext.class).estimateResourceConsumption(this);
- }
-
/**
* Estimate the resources consumed when this action is run locally.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java
index cf64db1..bf0bd3e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionContext.java
@@ -18,19 +18,12 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor.ActionContext;
-import com.google.devtools.build.lib.actions.ResourceSet;
/**
* Context for executing {@link CppLinkAction}s.
*/
@ActionContextMarker(name = "C++ link")
public interface CppLinkActionContext extends ActionContext {
-
- /**
- * Returns the estimated resource consumption of the action.
- */
- ResourceSet estimateResourceConsumption(CppLinkAction action);
-
/**
* Executes the specified action.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
index 817ee99..a99751a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
@@ -21,9 +21,7 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction;
-import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction.DeterministicWriter;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -223,11 +221,6 @@
return f.hexDigestAndReset();
}
- @Override
- public ResourceSet estimateResourceConsumptionLocal() {
- return ResourceSet.createWithRamCpuIo(/*memoryMb=*/0, /*cpuUsage=*/0, /*ioUsage=*/0.02);
- }
-
@VisibleForTesting
public Collection<Artifact> getPublicHeaders() {
return publicHeaders;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
index 4437878..ee8e92b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java
@@ -23,8 +23,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -82,15 +80,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- // We're mainly doing I/O, so CPU usage should be very low; most of the
- // time we'll be blocked waiting for the OS.
- // The only exception is the fingerprint digest calculation for the stamp
- // file contents.
- return ResourceSet.createWithRamCpuIo(/*memoryMb=*/0, /*cpuUsage=*/0.005, /*ioUsage=*/0.0);
- }
-
- @Override
public String computeKey() {
Fingerprint key = new Fingerprint();
for (Map.Entry<Artifact, Artifact> entry : symlinks.entrySet()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java
index 0a3d428..6a16ea7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java
@@ -22,9 +22,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-
import java.io.IOException;
/**
@@ -67,11 +65,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public void execute(ActionExecutionContext actionExecutionContext)
throws ActionExecutionException, InterruptedException {
Executor executor = actionExecutionContext.getExecutor();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
index cf57fd6..7df15c0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -269,9 +269,4 @@
public ResourceSet estimateResourceConsumptionLocal() {
return ResourceSet.createWithRamCpuIo(/*memoryMb=*/1, /*cpuUsage=*/0.1, /*ioUsage=*/0.0);
}
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return executor.getContext(actionContext).estimateResourceConsumption(this);
- }
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java
index ee2f194..be96246 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoStubAction.java
@@ -18,8 +18,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.vfs.Path;
@@ -59,11 +57,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public void prepare(Path execRoot) {
// The superclass would delete the output files here. We can't let that happen, since this
// action does not in fact create those files; it is only a placeholder and the actual files
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
index 98db892..c2bca35 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
@@ -22,8 +22,6 @@
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Actions;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -90,11 +88,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
Fingerprint f = new Fingerprint();
f.addPath(symlink.getPath());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
index 40f3194..7ec2b85 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
@@ -76,11 +76,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(CppCompileAction action) {
- return action.estimateResourceConsumptionLocal();
- }
-
- @Override
public Reply getReplyFromException(ExecException e, CppCompileAction action) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java
index c88a3c6..9360d2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java
@@ -20,7 +20,6 @@
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.actions.SpawnActionContext;
@@ -47,9 +46,4 @@
action.estimateResourceConsumptionLocal());
spawnActionContext.exec(spawn, actionExecutionContext);
}
-
- @Override
- public ResourceSet estimateResourceConsumption(CppLinkAction action) {
- return action.estimateResourceConsumptionLocal();
- }
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 8948b9d..93b5bcf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -543,14 +543,6 @@
return first;
}
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- if (getContext(executor).willExecuteRemotely(true)) {
- return ResourceSet.ZERO;
- }
- return LOCAL_RESOURCES;
- }
-
protected SpawnActionContext getContext(Executor executor) {
return executor.getSpawnActionContext(getMnemonic());
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
index e914308..06cb421 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestRunnerAction.java
@@ -25,7 +25,6 @@
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.NotifyOnActionCacheHit;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.UserExecException;
import com.google.devtools.build.lib.analysis.RunfilesSupplierImpl;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -295,11 +294,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String getRawProgressMessage() {
return "Testing " + getTestName();
}
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
index ce917f3..2743778 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
@@ -133,11 +133,6 @@
}
@Override
- public boolean willExecuteRemotely(boolean remotable) {
- return false;
- }
-
- @Override
public String toString() {
return "sandboxed";
}
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
index 6e2b3ce..fe9774d 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
@@ -155,11 +155,6 @@
return "standalone";
}
- @Override
- public boolean willExecuteRemotely(boolean remotable) {
- return false;
- }
-
/**
* Adds to the given environment all variables that are dependent on system state of the host
* machine.
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
index a0fadc8..009ee4d 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
@@ -432,11 +432,6 @@
}
@Override
- public boolean willExecuteRemotely(boolean remotable) {
- return false;
- }
-
- @Override
public boolean shouldPropagateExecException() {
return false;
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 92eeedf..24d321c 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -38,7 +38,6 @@
import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.MutableActionGraph;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.actions.cache.MetadataHandler;
import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
@@ -247,10 +246,6 @@
@Override protected String computeKey() { return "action"; }
- @Override public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
@Override
public String getMnemonic() {
return "Null";
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index 2d74dd8..9c39d84 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -20,12 +20,9 @@
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,9 +39,6 @@
public static final Runnable NO_EFFECT = new Runnable() { @Override public void run() {} };
- private static final ResourceSet RESOURCES =
- ResourceSet.createWithRamCpuIo(/*memoryMb=*/1.0, /*cpu=*/0.1, /*io=*/0.0);
-
protected final Callable<Void> effect;
/** Use this constructor if the effect can't throw exceptions. */
@@ -139,12 +133,6 @@
@Override
public String getMnemonic() { return "Test"; }
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return RESOURCES;
- }
-
-
/** No-op action that has exactly one output, and can be a middleman action. */
public static class DummyAction extends TestAction {
private final MiddlemanType type;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 8291d8e..de1247e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -28,11 +28,9 @@
import com.google.devtools.build.lib.actions.ArtifactFactory;
import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.ExecutionStrategy;
-import com.google.devtools.build.lib.actions.Executor;
import com.google.devtools.build.lib.actions.MiddlemanFactory;
import com.google.devtools.build.lib.actions.MutableActionGraph;
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
@@ -220,11 +218,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
public String computeKey() {
return "";
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
index 05442e6..7ef9677 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionDataTest.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.actions.util.DummyExecutor;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -63,11 +62,6 @@
}
@Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
-
- @Override
protected String computeKey() {
return "MyAction";
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
index 968406c..02c2b41 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
@@ -28,7 +28,6 @@
import com.google.devtools.build.lib.actions.ActionExecutionException;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
-import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.actions.util.DummyExecutor;
import com.google.devtools.build.lib.util.Fingerprint;
@@ -212,11 +211,6 @@
protected String computeKey() {
return getPrimaryOutput().getExecPathString() + executionCounter.get();
}
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
}
private static class ExecutionCountingCacheBypassingAction extends ExecutionCountingAction {
@@ -659,11 +653,6 @@
protected String computeKey() {
return new Fingerprint().addInt(42).hexDigestAndReset();
}
-
- @Override
- public ResourceSet estimateResourceConsumption(Executor executor) {
- return ResourceSet.ZERO;
- }
}
private abstract static class SingleOutputSkyframeAwareAction extends SingleOutputAction
