engine: initialize Omp

Author: illwieckz

src/engine/framework/Omp.cpp

@@ -81,19 +81,20 @@ void SetupThreads()
 #endif
 }
 
-void Init()
-{
-	ReadMaxThreads();
-	SetupThreads();
-}
-
-void ApplyThreads()
+void EnlistThreads()
 {
 #if defined(_OPENMP)
 	omp_set_num_threads( ompThreads );
 #endif
 }
 
+void Init()
+{
+	ReadMaxThreads();
+	SetupThreads();
+	EnlistThreads();
+}
+
 int GetThreads()
 {
 	return ompThreads;

src/engine/framework/Omp.h

@@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Omp {
 void SetupThreads();
+void EnlistThreads();
 void Init();
-void ApplyThreads();
 int GetThreads();
 
 template <typename T, typename S> void Tasker( const T& task, const S& amount )
@@ -46,7 +46,7 @@ template <typename T, typename S> void Tasker( const T& task, const S& amount )
 		return;
 	}
 
-	ApplyThreads();
+	EnlistThreads();
 
 	#pragma omp parallel for
 	for ( S i = 0; i < amount; i++ )

src/engine/framework/System.cpp

@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ConsoleHistory.h"
 #include "CommandSystem.h"
 #include "LogSystem.h"
+#include "Omp.h"
 #include "System.h"
 #include "CrashDump.h"
 #include "CvarSystem.h"
@@ -829,6 +830,8 @@ static void SetCvarsWithInitFlag(cmdlineArgs_t& cmdlineArgs)
 // Initialize the engine
 static void Init(int argc, char** argv)
 {
+	Omp::Init();
+
 	cmdlineArgs_t cmdlineArgs;
 
 #ifdef _WIN32

src/engine/qcommon/common.cpp

@@ -47,6 +47,7 @@ Maryland 20850 USA.
 #include "framework/CommandSystem.h"
 #include "framework/CvarSystem.h"
 #include "framework/LogSystem.h"
+#include "framework/Omp.h"
 #include "framework/System.h"
 #include "sys/sys_events.h"
 #include <common/FileSystem.h>
@@ -783,6 +784,8 @@ static Cvar::Cvar<bool> showTraceStats("common.showTraceStats", "are physics tra
 
 void Com_Frame()
 {
+	Omp::SetupThreads();
+
 	int             msec, minMsec;
 	static int      lastTime = 0;
 	//int             key;