make number of threads for multithreaded operations a preference

etternagame · Oct 5, 2018 · 0738389 · 0738389
1 parent 1b6ea1a
commit 0738389
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "global.h"
 #include "Foreach.h"
 #include "IniFile.h"
 #include "LuaManager.h"
@@ -228,9 +228,9 @@ PrefsManager::PrefsManager()
   , m_sTestInitialScreen("TestInitialScreen", "")
   , m_MuteActions("MuteActions", false)
   , m_bAllowSongDeletion("AllowSongDeletion", false)
-  ,
+  , ThreadsToUse("ThreadsToUse", 0)
 
-  m_bQuirksMode("QuirksMode", false)
+  , m_bQuirksMode("QuirksMode", false)
   ,
 
   /* Debug: */

diff --git a/src/PrefsManager.h b/src/PrefsManager.h
@@ -1,4 +1,4 @@
-#ifndef PREFSMANAGER_H
+#ifndef PREFSMANAGER_H
 #define PREFSMANAGER_H
 
 #include "GameConstantsAndTypes.h"
@@ -248,6 +248,7 @@ class PrefsManager
 	Preference<bool> m_bAllowSongDeletion; // Allow the user to remove songs
 										   // from their collection through UI /
 										   // keyboard shortcut
+	Preference<int> ThreadsToUse;
 
 	/** @brief Enable some quirky behavior used by some older versions of
 	 * StepMania. */

diff --git a/src/RageThreads.h b/src/RageThreads.h
@@ -75,7 +75,9 @@ parallelExecution(vector<T> vec,
 				  function<void(vectorRange<T>, ThreadData*)> exec,
 				  void* stuff)
 {
-	const int THREADS = std::thread::hardware_concurrency();
+	const int THREADS = PREFSMAN->ThreadsToUse <= 0
+						  ? std::thread::hardware_concurrency()
+						  : min((int)PREFSMAN->ThreadsToUse, (int)std::thread::hardware_concurrency());
 	std::vector<vectorRange<T>> workloads =
 	  splitWorkLoad(vec, static_cast<size_t>(vec.size() / THREADS));
 	ThreadData data;