Allow the number of threads used in target parsing to be configurable.

--
MOS_MIGRATED_REVID=89443026

2 files changed, 9 insertions, 8 deletions

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 2e76c14927..d4a35c22db 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
@@ -969,9 +969,9 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   }
 
   EvaluationResult<TargetPatternValue> targetPatterns(Iterable<SkyKey> patternSkyKeys,
-      boolean keepGoing, EventHandler eventHandler) throws InterruptedException {
+      int numThreads, boolean keepGoing, EventHandler eventHandler) throws InterruptedException {
     checkActive();
-    return buildDriver.evaluate(patternSkyKeys, keepGoing, DEFAULT_THREAD_COUNT,
+    return buildDriver.evaluate(patternSkyKeys, keepGoing, numThreads,
         eventHandler);
   }
 
@@ -1193,8 +1193,8 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     Iterable<SkyKey> patternSkyKeys = TargetPatternValue.keys(patterns, policy, offset);
     ResolvedTargets<Target> result;
     try {
-      result = patternEvaluator.parseTargetPatternKeys(patternSkyKeys, /*keepGoing=*/true,
-          eventHandler);
+      result = patternEvaluator.parseTargetPatternKeys(patternSkyKeys, /*numThreads=*/numThreads,
+        /*keepGoing=*/true, eventHandler);
     } catch (TargetParsingException e) {
       // Can't happen, since we ran with keepGoing.
       throw new IllegalStateException(e);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
index 050bdab598..8b8209a70d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
@@ -92,13 +92,14 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator {
       List<String> targetPatterns, FilteringPolicy policy, boolean keepGoing)
       throws InterruptedException, TargetParsingException {
     return parseTargetPatternKeys(TargetPatternValue.keys(targetPatterns, policy, offset),
-        keepGoing, eventHandler);
+       SkyframeExecutor.DEFAULT_THREAD_COUNT, keepGoing, eventHandler);
   }
 
-  ResolvedTargets<Target> parseTargetPatternKeys(Iterable<SkyKey> patternSkyKeys, boolean keepGoing,
-      EventHandler eventHandler) throws InterruptedException, TargetParsingException {
+  ResolvedTargets<Target> parseTargetPatternKeys(Iterable<SkyKey> patternSkyKeys, int numThreads,
+      boolean keepGoing, EventHandler eventHandler)
+      throws InterruptedException, TargetParsingException {
     EvaluationResult<TargetPatternValue> result =
-        skyframeExecutor.targetPatterns(patternSkyKeys, keepGoing, eventHandler);
+        skyframeExecutor.targetPatterns(patternSkyKeys, numThreads, keepGoing, eventHandler);
 
     String errorMessage = null;
     ResolvedTargets.Builder<Target> builder = ResolvedTargets.builder();