diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-04-27 12:54:41 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-04-27 12:54:41 +0000 |
commit | 81cfbfe7979c3fa9d635135a06a4831101538840 (patch) | |
tree | 86ecb09ff1c703add7ac0af636500870b8642c87 | |
parent | a31d90fe3960db716d4f7406d024c9b4eec9a173 (diff) |
Just pass HwInfo::Cpu instead of whole HwInfo
4 files changed, 8 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/server/initialize_threads_calculator/initialize_threads_calculator_test.cpp b/searchcore/src/tests/proton/server/initialize_threads_calculator/initialize_threads_calculator_test.cpp index a34af63371c..fc899f3a8c7 100644 --- a/searchcore/src/tests/proton/server/initialize_threads_calculator/initialize_threads_calculator_test.cpp +++ b/searchcore/src/tests/proton/server/initialize_threads_calculator/initialize_threads_calculator_test.cpp @@ -17,8 +17,7 @@ void expect_successful_init(uint32_t exp_threads) { constexpr uint32_t cfg_threads = 9; - HwInfo hw_info(HwInfo::Disk(1,false, false), HwInfo::Memory(1), HwInfo::Cpu(cfg_threads)); - InitializeThreadsCalculator i(hw_info, "tmp", cfg_threads); + InitializeThreadsCalculator i(HwInfo::Cpu(cfg_threads), "tmp", cfg_threads); EXPECT_EQ(exp_threads, i.num_threads()); EXPECT_TRUE(i.threads().get() != nullptr); EXPECT_EQ(exp_threads, dynamic_cast<const ThreadStackExecutor&>(*i.threads()).getNumThreads()); @@ -29,8 +28,7 @@ expect_successful_init(uint32_t exp_threads) void expect_aborted_init(uint32_t exp_threads, uint32_t cfg_threads = 9) { - HwInfo hw_info(HwInfo::Disk(1,false, false), HwInfo::Memory(1), HwInfo::Cpu(cfg_threads)); - InitializeThreadsCalculator i(hw_info, "tmp", cfg_threads); + InitializeThreadsCalculator i(HwInfo::Cpu(cfg_threads), "tmp", cfg_threads); EXPECT_EQ(exp_threads, i.num_threads()); EXPECT_TRUE(i.threads().get() != nullptr); EXPECT_EQ(exp_threads, dynamic_cast<const ThreadStackExecutor&>(*i.threads()).getNumThreads()); @@ -56,8 +54,7 @@ TEST_F(InitializeThreadsCalculatorTest, initialize_threads_cut_in_half_when_init TEST_F(InitializeThreadsCalculatorTest, zero_initialize_threads_is_special) { { - HwInfo hw_info(HwInfo::Disk(1,false, false), HwInfo::Memory(1), HwInfo::Cpu(10)); - InitializeThreadsCalculator i(hw_info, "tmp", 0); + InitializeThreadsCalculator i(HwInfo::Cpu(10), "tmp", 0); EXPECT_EQ(0, i.num_threads()); EXPECT_TRUE(i.threads().get() == nullptr); } @@ -67,8 +64,7 @@ TEST_F(InitializeThreadsCalculatorTest, zero_initialize_threads_is_special) void expect_lower(uint32_t cores, uint32_t configured) { - HwInfo hw_info(HwInfo::Disk(1,false, false), HwInfo::Memory(1), HwInfo::Cpu(cores)); - InitializeThreadsCalculator i(hw_info, "tmp", configured); + InitializeThreadsCalculator i(HwInfo::Cpu(cores), "tmp", configured); EXPECT_EQ(std::min(cores, configured), i.num_threads()); i.init_done(); } diff --git a/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.cpp b/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.cpp index e3a3a978e68..bb1325acf04 100644 --- a/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.cpp @@ -39,11 +39,11 @@ const vespalib::string file_name = "initialize-threads.txt"; namespace proton { -InitializeThreadsCalculator::InitializeThreadsCalculator(const HwInfo & hw_info, +InitializeThreadsCalculator::InitializeThreadsCalculator(const HwInfo::Cpu & cpu_info, const vespalib::string& base_dir, uint32_t configured_num_threads) : _path(base_dir + "/" + file_name), - _num_threads(std::min(hw_info.cpu().cores(), configured_num_threads)), + _num_threads(std::min(cpu_info.cores(), configured_num_threads)), _threads() { if (std::filesystem::exists(_path)) { diff --git a/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.h b/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.h index bfa6102066a..e7e1b22f181 100644 --- a/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.h +++ b/searchcore/src/vespa/searchcore/proton/server/initialize_threads_calculator.h @@ -26,7 +26,7 @@ namespace proton { InitializeThreads _threads; public: - InitializeThreadsCalculator(const HwInfo & hwInfo, const vespalib::string& base_dir, uint32_t configured_num_threads); + InitializeThreadsCalculator(const HwInfo::Cpu & cpu_info, const vespalib::string& base_dir, uint32_t configured_num_threads); ~InitializeThreadsCalculator(); uint32_t num_threads() const { return _num_threads; } InitializeThreads threads() const { return _threads; } diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 0a95b836544..7f3dc02aba8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -352,7 +352,7 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) vespalib::string fileConfigId; _compile_cache_executor_binding = vespalib::eval::CompileCache::bind(_shared_service->shared_raw()); - InitializeThreadsCalculator calc(hwInfo, protonConfig.basedir, protonConfig.initialize.threads); + InitializeThreadsCalculator calc(hwInfo.cpu(), protonConfig.basedir, protonConfig.initialize.threads); LOG(info, "Start initializing components: threads=%u, configured=%u", calc.num_threads(), protonConfig.initialize.threads); _initDocumentDbsInSequence = (calc.num_threads() == 1); |