1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the detection of the number of cores on Unix prettier

Browse Source 
This is a no-op change. It doesn't improve or worsen the code at all.

Change-Id: Ifd5273842370ca9bce0ed74f2f2d54d453797948
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thiago Macieira 2014-12-17 18:47:52 -08:00
parent d866f6e886
commit a945124a42
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/thread/qthread_unix.cpp
View File

@ -395,14 +395,13 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW
int QThread::idealThreadCount() Q_DECL_NOTHROW int QThread::idealThreadCount() Q_DECL_NOTHROW
{ {
int cores = -1; int cores = 1;
#if defined(Q_OS_HPUX) #if defined(Q_OS_HPUX)
// HP-UX // HP-UX
struct pst_dynamic psd; struct pst_dynamic psd;
if (pstat_getdynamic(&psd, sizeof(psd), 1, 0) == -1) { if (pstat_getdynamic(&psd, sizeof(psd), 1, 0) == -1) {
perror("pstat_getdynamic"); perror("pstat_getdynamic");
cores = -1;
} else { } else {
cores = (int)psd.psd_proc_cnt; cores = (int)psd.psd_proc_cnt;
} }
@ -414,7 +413,6 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW
mib[1] = HW_NCPU; mib[1] = HW_NCPU;
if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) { if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) {
perror("sysctl"); perror("sysctl");
cores = -1;
} }
#elif defined(Q_OS_IRIX) #elif defined(Q_OS_IRIX)
// IRIX // IRIX
@ -449,9 +447,9 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW
#else #else
// the rest: Linux, Solaris, AIX, Tru64 // the rest: Linux, Solaris, AIX, Tru64
cores = (int)sysconf(_SC_NPROCESSORS_ONLN); cores = (int)sysconf(_SC_NPROCESSORS_ONLN);
#endif
if (cores == -1) if (cores == -1)
return 1; return 1;
#endif
return cores; return cores;
} }