diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
10 files changed, 28 insertions, 41 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java index 2362cbdd35..7995681706 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java @@ -209,6 +209,10 @@ public final class BlazeDirectories { return BlazeDirectories.getRelativeOutputPath(productName); } + public String getProductName() { + return productName; + } + /** * Returns the output directory name, relative to the execRoot. * TODO(bazel-team): (2011) make this private? diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java index 0fbb053d65..31cfca5d79 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java @@ -259,7 +259,8 @@ public class FdoSupport { Path fdoProfile, LipoMode lipoMode, boolean llvmFdo, - Path execRoot) + Path execRoot, + String productName) throws IOException, FdoException, InterruptedException { FdoMode fdoMode; if (fdoProfile != null && isAutoFdo(fdoProfile.getBaseName())) { @@ -279,8 +280,7 @@ public class FdoSupport { Root fdoRoot = (fdoProfile == null) ? null - : Root.asDerivedRoot(execRoot, execRoot.getRelative( - PrecomputedValue.PRODUCT_NAME.get(env) + "-fdo"), true); + : Root.asDerivedRoot(execRoot, execRoot.getRelative(productName + "-fdo"), true); PathFragment fdoRootExecPath = fdoProfile == null ? null @@ -309,9 +309,8 @@ public class FdoSupport { fdoMode, LipoMode.OFF, fdoRoot, fdoRootExecPath, fdoInstrument, fdoProfile, null); } - FdoZipContents fdoZipContents = extractFdoZip( - fdoMode, lipoMode, execRoot, fdoProfile, fdoRootExecPath, - PrecomputedValue.PRODUCT_NAME.get(env)); + FdoZipContents fdoZipContents = + extractFdoZip(fdoMode, lipoMode, execRoot, fdoProfile, fdoRootExecPath, productName); return new FdoSupport( fdoMode, lipoMode, fdoRoot, fdoRootExecPath, fdoInstrument, fdoProfile, fdoZipContents); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java index d8e2490a09..03d3d42e17 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java @@ -66,7 +66,8 @@ public class FdoSupportFunction implements SkyFunction { key.getFdoZip(), key.getLipoMode(), key.getLLVMFdo(), - execRoot); + execRoot, + directories.getProductName()); if (env.valuesMissing()) { return null; } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index b55de409c3..b904e1df80 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -204,8 +204,8 @@ public final class BlazeRuntime { for (BlazeModule module : blazeModules) { module.workspaceInit(this, directories, builder); } - this.workspace = builder.build( - this, packageFactory, ruleClassProvider, getProductName(), eventBusExceptionHandler); + this.workspace = + builder.build(this, packageFactory, ruleClassProvider, eventBusExceptionHandler); return workspace; } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java index 8930fa169a..f7079bf81f 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java @@ -68,7 +68,6 @@ public final class WorkspaceBuilder { BlazeRuntime runtime, PackageFactory packageFactory, ConfiguredRuleClassProvider ruleClassProvider, - String productName, SubscriberExceptionHandler eventBusExceptionHandler) throws AbruptExitException { // Set default values if none are set. if (skyframeExecutorFactory == null) { @@ -78,18 +77,18 @@ public final class WorkspaceBuilder { allowedMissingInputs = Predicates.alwaysFalse(); } - SkyframeExecutor skyframeExecutor = skyframeExecutorFactory.create( - packageFactory, - directories, - binTools, - workspaceStatusActionFactory, - ruleClassProvider.getBuildInfoFactories(), - diffAwarenessFactories.build(), - allowedMissingInputs, - skyFunctions.build(), - precomputedValues.build(), - customDirtinessCheckers.build(), - productName); + SkyframeExecutor skyframeExecutor = + skyframeExecutorFactory.create( + packageFactory, + directories, + binTools, + workspaceStatusActionFactory, + ruleClassProvider.getBuildInfoFactories(), + diffAwarenessFactories.build(), + allowedMissingInputs, + skyFunctions.build(), + precomputedValues.build(), + customDirtinessCheckers.build()); return new BlazeWorkspace( runtime, directories, skyframeExecutor, eventBusExceptionHandler, workspaceStatusActionFactory, binTools); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java index 1068aa9714..d6b0e95e57 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java @@ -104,9 +104,6 @@ public final class PrecomputedValue implements SkyValue { public static final Precomputed<Map<BuildInfoKey, BuildInfoFactory>> BUILD_INFO_FACTORIES = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "build_info_factories")); - public static final Precomputed<String> PRODUCT_NAME = - new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "product_name")); - static final Precomputed<ImmutableMap<ActionAnalysisMetadata, ConflictException>> BAD_ACTIONS = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "bad_actions")); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java index e4859d10bb..d0b479b897 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java @@ -123,7 +123,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, PathFragment blacklistedPackagePrefixesFile, - String productName, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -139,7 +138,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { extraPrecomputedValues, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, blacklistedPackagePrefixesFile, - productName, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); @@ -159,7 +157,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, PathFragment blacklistedPackagePrefixesFile, - String productName, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -177,7 +174,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { extraPrecomputedValues, customDirtinessCheckers, blacklistedPackagePrefixesFile, - productName, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java index 3dd9c0dc22..6173e8a8ee 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java @@ -41,8 +41,7 @@ public class SequencedSkyframeExecutorFactory implements SkyframeExecutorFactory Predicate<PathFragment> allowedMissingInputs, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, - Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - String productName) { + Iterable<SkyValueDirtinessChecker> customDirtinessCheckers) { return SequencedSkyframeExecutor.create( pkgFactory, directories, @@ -55,7 +54,6 @@ public class SequencedSkyframeExecutorFactory implements SkyframeExecutorFactory extraPrecomputedValues, customDirtinessCheckers, PathFragment.EMPTY_FRAGMENT, - productName, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); 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 b44de64e71..dc1ca91ea7 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 @@ -273,8 +273,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { private final ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions; private final ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues; - private final String productName; - protected SkyframeIncrementalBuildMonitor incrementalBuildMonitor = new SkyframeIncrementalBuildMonitor(); @@ -309,7 +307,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, ExternalFileAction externalFileAction, PathFragment blacklistedPackagePrefixesFile, - String productName, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -341,7 +338,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { this.artifactFactory.set(skyframeBuildView.getArtifactFactory()); this.externalFilesHelper = new ExternalFilesHelper( pkgLocator, this.externalFileAction, directories); - this.productName = productName; this.crossRepositoryLabelViolationStrategy = crossRepositoryLabelViolationStrategy; this.buildFilesByPriority = buildFilesByPriority; this.actionOnIOExceptionReadingBuildFile = actionOnIOExceptionReadingBuildFile; @@ -718,7 +714,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { protected void maybeInjectPrecomputedValuesForAnalysis() { if (needToInjectPrecomputedValuesForAnalysis) { - PrecomputedValue.PRODUCT_NAME.set(injectable(), productName); injectBuildInfoFactories(); injectExtraPrecomputedValues(extraPrecomputedValues); needToInjectPrecomputedValuesForAnalysis = false; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java index 98f1e9d651..225ffd3e7b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java @@ -34,8 +34,8 @@ public interface SkyframeExecutorFactory { /** * Creates an instance of SkyframeExecutor * - * @param pkgFactory the package factory * @param tsgm timestamp granularity monitor + * @param pkgFactory the package factory * @param directories Blaze directories * @param binTools the embedded tools * @param workspaceStatusActionFactory a factory for creating WorkspaceStatusAction objects @@ -45,7 +45,6 @@ public interface SkyframeExecutorFactory { * @param extraSkyFunctions * @param extraPrecomputedValues * @param customDirtinessCheckers - * @param productName * @return an instance of the SkyframeExecutor * @throws AbruptExitException if the executor cannot be created */ @@ -59,7 +58,6 @@ public interface SkyframeExecutorFactory { Predicate<PathFragment> allowedMissingInputs, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, - Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - String productName) + Iterable<SkyValueDirtinessChecker> customDirtinessCheckers) throws AbruptExitException; } |