Add a hidden flag which allows us to set the size of the legacy globbing thread pool.
--
MOS_MIGRATED_REVID=94236393
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 4d7b71f..02c7f03 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -366,7 +366,7 @@
globalEnv = newGlobalEnvironment();
threadPool = new ThreadPoolExecutor(100, 100, 3L, TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(),
- new ThreadFactoryBuilder().setNameFormat("PackageFactory %d").build());
+ new ThreadFactoryBuilder().setNameFormat("Legacy globber %d").build());
// Do not consume threads when not in use.
threadPool.allowCoreThreadTimeOut(true);
this.environmentExtensions = ImmutableList.copyOf(environmentExtensions);
@@ -388,6 +388,15 @@
}
/**
+ * Sets the max number of threads to use for globbing.
+ */
+ public void setGlobbingThreads(int globbingThreads) {
+ threadPool.setCorePoolSize(globbingThreads);
+ threadPool.setMaximumPoolSize(globbingThreads);
+ }
+
+
+ /**
* Returns the static environment initialized once and shared by all packages
* created by this factory. No updates occur to this environment once created.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
index 6db7cf6..e57fe0d 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
@@ -120,6 +120,12 @@
+ "'private').")
public RuleVisibility defaultVisibility;
+ @Option(name = "legacy_globbing_threads",
+ defaultValue = "100",
+ category = "undocumented",
+ help = "Number of threads to use for glob evaluation.")
+ public int globbingThreads;
+
@Option(name = "min_pkg_count_for_ct_node_eviction",
defaultValue = "3700",
// Why is the default value 3700? As of December 2013, a medium target loads about this many
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 f2ad498..ca12499 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
@@ -735,8 +735,8 @@
*/
@VisibleForTesting // productionVisibility = Visibility.PRIVATE
public void preparePackageLoading(PathPackageLocator pkgLocator, RuleVisibility defaultVisibility,
- boolean showLoadingProgress,
- String defaultsPackageContents, UUID commandId) {
+ boolean showLoadingProgress, int globbingThreads,
+ String defaultsPackageContents, UUID commandId) {
Preconditions.checkNotNull(pkgLocator);
setActive(true);
@@ -748,6 +748,7 @@
setPackageLocator(pkgLocator);
syscalls.set(new PerBuildSyscallCache());
+ this.pkgFactory.setGlobbingThreads(globbingThreads);
checkPreprocessorFactory();
emittedEventState.clear();
@@ -1328,7 +1329,7 @@
preparePackageLoading(
createPackageLocator(packageCacheOptions, directories.getWorkspace(), workingDirectory),
packageCacheOptions.defaultVisibility, packageCacheOptions.showLoadingProgress,
- defaultsPackageContents, commandId);
+ packageCacheOptions.globbingThreads, defaultsPackageContents, commandId);
setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.deletedPackages));
incrementalBuildMonitor = new SkyframeIncrementalBuildMonitor();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index de8bc7a..e5bfd83 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -173,7 +173,7 @@
);
skyframeExecutor.preparePackageLoading(pkgLocator,
Options.getDefaults(PackageCacheOptions.class).defaultVisibility, true,
- ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
+ 3, ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
packageManager = skyframeExecutor.getPackageManager();
loadingPhaseRunner = new LoadingPhaseRunner(packageManager, pkgFactory.getRuleClassNames());
buildView = new BuildView(directories, skyframeExecutor.getPackageManager(), ruleClassProvider,
@@ -245,7 +245,7 @@
packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
skyframeExecutor.preparePackageLoading(pathPackageLocator,
packageCacheOptions.defaultVisibility, true,
- ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
+ 7, ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
skyframeExecutor.invalidateFilesUnderPathForTesting(ModifiedFileSet.EVERYTHING_MODIFIED,
rootDirectory);
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 95c4b95..361e71d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -196,7 +196,7 @@
getPrecomputedValues()
);
skyframeExecutor.preparePackageLoading(
- new PathPackageLocator(rootDirectory), ConstantRuleVisibility.PUBLIC, true, "",
+ new PathPackageLocator(rootDirectory), ConstantRuleVisibility.PUBLIC, true, 7, "",
UUID.randomUUID());
useConfiguration();
setUpSkyframe();
@@ -277,7 +277,7 @@
packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
skyframeExecutor.preparePackageLoading(pkgLocator,
packageCacheOptions.defaultVisibility, true,
- ruleClassProvider.getDefaultsPackageContent(optionsParser),
+ 7, ruleClassProvider.getDefaultsPackageContent(optionsParser),
UUID.randomUUID());
skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.deletedPackages));
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 18463e8..4222a91 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -105,7 +105,7 @@
skyframeExecutor.preparePackageLoading(pkgLocator,
Options.getDefaults(PackageCacheOptions.class).defaultVisibility, true,
- ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
+ 7, ruleClassProvider.getDefaultsPackageContent(), UUID.randomUUID());
AnalysisMock analysisMock = getAnalysisMock();
analysisMock.setupMockClient(new MockToolsConfig(rootDirectory));
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index 8d7ee5b..e789d51 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -83,7 +83,7 @@
ImmutableList.<PrecomputedValue.Injected>of()
);
skyframeExecutor.preparePackageLoading(
- new PathPackageLocator(rootDirectory), ConstantRuleVisibility.PUBLIC, true, "",
+ new PathPackageLocator(rootDirectory), ConstantRuleVisibility.PUBLIC, true, 7, "",
UUID.randomUUID());
setUpSkyframe(parsePackageCacheOptions());
}
@@ -97,7 +97,7 @@
packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory);
skyframeExecutor.preparePackageLoading(pkgLocator,
packageCacheOptions.defaultVisibility, true,
- ruleClassProvider.getDefaultsPackageContent(),
+ 7, ruleClassProvider.getDefaultsPackageContent(),
UUID.randomUUID());
skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.deletedPackages));
}
