From 584843e5bb009c38ba215a141b121f6d7b8a33de Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 3 Mar 2017 15:24:06 +0000 Subject: Remove all the action resource estimation code -- PiperOrigin-RevId: 149110466 MOS_MIGRATED_REVID=149110466 --- .../google/devtools/build/lib/rules/cpp/CppCompileAction.java | 5 ----- .../devtools/build/lib/rules/cpp/CppCompileActionContext.java | 8 +------- .../google/devtools/build/lib/rules/cpp/CppLinkAction.java | 5 ----- .../devtools/build/lib/rules/cpp/CppLinkActionContext.java | 7 ------- .../devtools/build/lib/rules/cpp/CppModuleMapAction.java | 7 ------- .../devtools/build/lib/rules/cpp/CreateIncSymlinkAction.java | 11 ----------- .../devtools/build/lib/rules/cpp/ExtractInclusionAction.java | 7 ------- .../devtools/build/lib/rules/cpp/FakeCppCompileAction.java | 5 ----- .../google/devtools/build/lib/rules/cpp/FdoStubAction.java | 7 ------- .../devtools/build/lib/rules/cpp/SolibSymlinkAction.java | 7 ------- .../google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java | 5 ----- .../devtools/build/lib/rules/cpp/SpawnLinkStrategy.java | 6 ------ .../devtools/build/lib/rules/java/JavaCompileAction.java | 8 -------- .../devtools/build/lib/rules/test/TestRunnerAction.java | 6 ------ 14 files changed, 1 insertion(+), 93 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules') 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 d1f0e4b8f6..e8356092ce 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 @@ public class CppCompileAction extends AbstractAction return context.getDeclaredIncludeSrcs(); } - @Override - public ResourceSet estimateResourceConsumption(Executor executor) { - return executor.getContext(actionContext).estimateResourceConsumption(this); - } - @VisibleForTesting public Class 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 192a789c24..903829275c 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.ActionExecutionException; 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 @@ public interface CppCompileActionContext extends ActionContext { *

Returns null if additional inputs will only be found during action execution, not before. */ @Nullable - public Iterable findAdditionalInputs( + Iterable findAdditionalInputs( CppCompileAction action, ActionExecutionContext actionExecutionContext, IncludeProcessing includeProcessing) @@ -61,9 +60,4 @@ public interface CppCompileActionContext extends ActionContext { */ @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 2082192068..0fbd2d05ec 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 @@ public final class CppLinkAction extends AbstractAction 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 cf64db187f..bf0bd3e9e2 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.ActionExecutionContext; 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 817ee99c60..a99751a8b1 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.ActionExecutionContext; 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 @@ public final class CppModuleMapAction extends AbstractFileWriteAction { return f.hexDigestAndReset(); } - @Override - public ResourceSet estimateResourceConsumptionLocal() { - return ResourceSet.createWithRamCpuIo(/*memoryMb=*/0, /*cpuUsage=*/0, /*ioUsage=*/0.02); - } - @VisibleForTesting public Collection 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 443787863a..ee8e92b2ef 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.ActionExecutionContext; 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; @@ -81,15 +79,6 @@ public final class CreateIncSymlinkAction extends AbstractAction { return symlinks; } - @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(); 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 0a3d428bb8..6a16ea78e3 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.ActionOwner; 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; /** @@ -66,11 +64,6 @@ final class ExtractInclusionAction extends AbstractAction { return "Extracting include lines from " + getPrimaryInput().prettyPrint(); } - @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/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java index cf57fd67d3..7df15c067d 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 class FakeCppCompileAction extends CppCompileAction { 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 ee2f194f03..be9624625b 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.AbstractAction; 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; @@ -58,11 +56,6 @@ public final class FdoStubAction extends AbstractAction { return "fdoStubAction"; } - @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 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 98db892c9a..c2bca35809 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.ActionExecutionException; 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; @@ -89,11 +87,6 @@ public final class SolibSymlinkAction extends AbstractAction { return symlink; } - @Override - public ResourceSet estimateResourceConsumption(Executor executor) { - return ResourceSet.ZERO; - } - @Override protected String computeKey() { Fingerprint f = new Fingerprint(); 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 40f3194828..7ec2b85121 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 @@ -75,11 +75,6 @@ public class SpawnGccStrategy implements CppCompileActionContext { return null; } - @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 c88a3c6447..9360d2a185 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.BaseSpawn; 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 @@ public final class SpawnLinkStrategy implements CppLinkActionContext { 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 8948b9dd1c..93b5bcf9c0 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 @@ public final class JavaCompileAction extends AbstractAction { 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 e9143087f4..06cb42116c 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.Artifact; 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; @@ -294,11 +293,6 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa } } - @Override - public ResourceSet estimateResourceConsumption(Executor executor) { - return ResourceSet.ZERO; - } - @Override protected String getRawProgressMessage() { return "Testing " + getTestName(); -- cgit v1.2.3