From d6d1695d89154f93c25a3082669de6c79e3fab46 Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Wed, 22 Jan 2025 11:11:36 -0500 Subject: KWSys 2025-01-22 (22ffdf26) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 22ffdf26989e08367b722087a7f126ce23eb8e2f (master). Upstream Shortlog ----------------- Tom Stellard (1): e1aeb61e SystemInformation: Fix GetNumberOfLogicalCPU on s390x --- SystemInformation.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 7b0d271..9b1a85b 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -3418,10 +3418,16 @@ bool SystemInformationImplementation::RetrieveInformationFromCpuInfoFile() buffer.resize(fileSize - 2); // Number of logical CPUs (combination of multiple processors, multi-core // and SMT) - size_t pos = buffer.find("processor\t"); + const char* processor_string = +#ifdef __s390x__ + "cpu number"; +#else + "processor\t"; +#endif + size_t pos = buffer.find(processor_string); while (pos != std::string::npos) { this->NumberOfLogicalCPU++; - pos = buffer.find("processor\t", pos + 1); + pos = buffer.find(processor_string, pos + 1); } #if defined(__linux) || defined(__CYGWIN__) -- cgit v0.12