Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Slightly tweak algorithm to automatically set the number of instances: Instead of restricting the number of instances to 4, we now use '(cpu_cores / 2) + 2' instances for more than 4 CPU cores. For at most 4 CPU cores, we still use 'cpu_cores' instances. This way we can use more than 4 instances on CPU's with more than 4 cores, but the number of instances won't grow linearly with the number of CPU cores - should help a bit to avoid HDD thrashing.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-11-16 22:53:18 +01:00
parent 61e5ab9f6a
commit a2cae5c288
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Dialog_Processing.cpp
View File

@ -68,9 +68,6 @@
//Maximum number of parallel instances //Maximum number of parallel instances
#define MAX_INSTANCES 16U #define MAX_INSTANCES 16U
//Maximum number of CPU cores for auto-detection
#define MAX_CPU_COUNT 4U
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#define CHANGE_BACKGROUND_COLOR(WIDGET, COLOR) \ #define CHANGE_BACKGROUND_COLOR(WIDGET, COLOR) \
@ -126,6 +123,8 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
//Init progress indicator //Init progress indicator
m_progressIndicator = new QMovie(":/images/Working.gif"); m_progressIndicator = new QMovie(":/images/Working.gif");
m_progressIndicator->setCacheMode(QMovie::CacheAll);
m_progressIndicator->setSpeed(50);
label_headerWorking->setMovie(m_progressIndicator); label_headerWorking->setMovie(m_progressIndicator);
progressBar->setValue(0); progressBar->setValue(0);
@ -361,7 +360,7 @@ void ProcessingDialog::initEncoding(void)
if(maximumInstances < 1) if(maximumInstances < 1)
{ {
lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features(); lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features();
maximumInstances = qBound(1U, static_cast<unsigned int>(cpuFeatures.count), MAX_CPU_COUNT); maximumInstances = (cpuFeatures.count > 4) ? ((cpuFeatures.count / 2) + 2) : cpuFeatures.count;
} }
unsigned int parallelThreadCount = qBound(1U, maximumInstances, static_cast<unsigned int>(m_pendingJobs.count())); unsigned int parallelThreadCount = qBound(1U, maximumInstances, static_cast<unsigned int>(m_pendingJobs.count()));
@ -965,4 +964,4 @@ bool ProcessingDialog::shutdownComputer(void)
progressDialog.close(); progressDialog.close();
return true; return true;
} }

2
src/Global.cpp
View File

@ -616,7 +616,7 @@ lamexp_cpu_t lamexp_detect_cpu_features(int argc, char **argv)
{ {
GetSystemInfo(&systemInfo); GetSystemInfo(&systemInfo);
} }
features.count = systemInfo.dwNumberOfProcessors; features.count = qBound(1UL, systemInfo.dwNumberOfProcessors, 64UL);
#else #else
GetNativeSystemInfo(&systemInfo); GetNativeSystemInfo(&systemInfo);
features.count = systemInfo.dwNumberOfProcessors; features.count = systemInfo.dwNumberOfProcessors;