From 0c33df56f0ea8ab5ff629a4c4f72793742d4f40a Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Sat, 18 Sep 2010 20:41:03 +0000
Subject: [PATCH] Display number of processors in System Info dialog.

Since Rockbox Utility got support for utilizing more than one CPU / Core
this value might be helpful in case of issues like FS#11496 (QThreadPool
defaults to the number of CPUs found as maximum number of threads).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28106 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/base/system.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp
index 748bc6076..11b31e8f1 100644
--- a/rbutil/rbutilqt/base/system.cpp
+++ b/rbutil/rbutilqt/base/system.cpp
@@ -164,6 +164,7 @@ QString System::osVersionString(void)
 {
     QString result;
 #if defined(Q_OS_WIN32)
+    SYSTEM_INFO sysinfo;
     OSVERSIONINFO osvi;
     ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@@ -175,14 +176,22 @@ QString System::osVersionString(void)
             .arg(QString::fromWCharArray(osvi.szCSDVersion));
     else
         result += QString("build %1").arg(osvi.dwBuildNumber);
+    result += QString("<br/>CPU: %1, %2 processor(s)").arg(sysinfo.dwProcessorType)
+              .arg(sysinfo.dwNumberOfProcessors);
 #endif
 #if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
     struct utsname u;
     int ret;
     ret = uname(&u);
 
-    result = QString("CPU: %1<br/>System: %2<br/>Release: %3<br/>Version: %4")
-        .arg(u.machine).arg(u.sysname).arg(u.release).arg(u.version);
+#if defined(Q_OS_MACX)
+    ItemCount cores = MPProcessors();
+#else
+    long cores = sysconf(_SC_NPROCESSORS_ONLN);
+#endif
+    result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
+    result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
+        .arg(u.sysname).arg(u.release).arg(u.version);
 #if defined(Q_OS_MACX)
     SInt32 major;
     SInt32 minor;
-- 
2.11.4.GIT