From c328856cb218a8df8d04b021b3ef12ad8f9729b4 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Fri, 15 Mar 2024 14:46:26 +0100
Subject: parallelism: Do not spawn more threads than asked to

...in the tool proper, i.e., excepting tests.
---
 src/buildtool/main/main.cpp                           | 4 ++--
 src/buildtool/serve_api/serve_service/source_tree.cpp | 2 +-
 src/buildtool/serve_api/serve_service/target.cpp      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index c8a74a5b..98fe2d42 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -1036,7 +1036,7 @@ auto main(int argc, char* argv[]) -> int {
                     ReportTaintedness(*result);
                     // Clean up in parallel
                     {
-                        TaskSystem ts;
+                        TaskSystem ts{arguments.common.jobs};
                         result_map.Clear(&ts);
                     }
                     return kExitSuccess;
@@ -1070,7 +1070,7 @@ auto main(int argc, char* argv[]) -> int {
 
                 // Clean up result map, now that it is no longer needed
                 {
-                    TaskSystem ts;
+                    TaskSystem ts{arguments.common.jobs};
                     result_map.Clear(&ts);
                 }
 
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index eb08f643..90de9f0e 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -399,7 +399,7 @@ auto SourceTreeService::ResolveContentTree(
         ResolvedGitObject resolved_tree{};
         bool failed{false};
         {
-            TaskSystem ts{std::max(1U, std::thread::hardware_concurrency())};
+            TaskSystem ts{RemoteServeConfig::Jobs()};
             resolve_symlinks_map_.ConsumeAfterKeysReady(
                 &ts,
                 {GitObjectToResolve{tree_id,
diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp
index 3836c7d8..f5773aac 100644
--- a/src/buildtool/serve_api/serve_service/target.cpp
+++ b/src/buildtool/serve_api/serve_service/target.cpp
@@ -437,7 +437,7 @@ auto TargetService::ServeTarget(
 
     // Clean up result map, now that it is no longer needed
     {
-        TaskSystem ts;
+        TaskSystem ts{RemoteServeConfig::Jobs()};
         result_map.Clear(&ts);
     }
 
-- 
cgit v1.2.3