mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-13 23:22:34 -05:00
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
This commit is contained in:
parent
f18e630ef2
commit
752ce1e6e7
1 changed files with 11 additions and 2 deletions
|
|
@ -164,6 +164,7 @@ QString System::osVersionString(void)
|
||||||
{
|
{
|
||||||
QString result;
|
QString result;
|
||||||
#if defined(Q_OS_WIN32)
|
#if defined(Q_OS_WIN32)
|
||||||
|
SYSTEM_INFO sysinfo;
|
||||||
OSVERSIONINFO osvi;
|
OSVERSIONINFO osvi;
|
||||||
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
|
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
|
||||||
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
||||||
|
|
@ -175,14 +176,22 @@ QString System::osVersionString(void)
|
||||||
.arg(QString::fromWCharArray(osvi.szCSDVersion));
|
.arg(QString::fromWCharArray(osvi.szCSDVersion));
|
||||||
else
|
else
|
||||||
result += QString("build %1").arg(osvi.dwBuildNumber);
|
result += QString("build %1").arg(osvi.dwBuildNumber);
|
||||||
|
result += QString("<br/>CPU: %1, %2 processor(s)").arg(sysinfo.dwProcessorType)
|
||||||
|
.arg(sysinfo.dwNumberOfProcessors);
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
|
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
|
||||||
struct utsname u;
|
struct utsname u;
|
||||||
int ret;
|
int ret;
|
||||||
ret = uname(&u);
|
ret = uname(&u);
|
||||||
|
|
||||||
result = QString("CPU: %1<br/>System: %2<br/>Release: %3<br/>Version: %4")
|
#if defined(Q_OS_MACX)
|
||||||
.arg(u.machine).arg(u.sysname).arg(u.release).arg(u.version);
|
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)
|
#if defined(Q_OS_MACX)
|
||||||
SInt32 major;
|
SInt32 major;
|
||||||
SInt32 minor;
|
SInt32 minor;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue