Merge e095f44 into 507c06e

google · Oct 21, 2018 · 1e3ccc8 · 1e3ccc8
2 parents 507c06e + e095f44
commit 1e3ccc8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
@@ -404,7 +404,13 @@ int GetNumCPUs() {
     if (ln.empty()) continue;
     size_t SplitIdx = ln.find(':');
     std::string value;
+#if defined(__s390__)
+    // s390 has another format in /proc/cpuinfo
+    // it needs to be parsed differently
+    if (SplitIdx != std::string::npos) value = ln.substr(Key.size()+1,SplitIdx-Key.size()-1);
+#else
     if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
+#endif
     if (ln.size() >= Key.size() && ln.compare(0, Key.size(), Key) == 0) {
       NumCPUs++;
       if (!value.empty()) {