Move CThread and CThreadManager to new xrUtil library.

Author: nitrocaster

src/engine.sln

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "compiler.h"
 #include "xrCDB/Intersect.hpp"
-#include "xrThread.h"
+#include "utils/xrUtil/xrThread.hpp"
 #include <mmsystem.h>
 
 #include "quadtree.h"
@@ -238,7 +238,7 @@ class	CoverThread : public CThread
 	typedef float	Cover[4];
 
 public:
-	CoverThread			(u32 ID, u32 _start, u32 _end) : CThread(ID)
+	CoverThread			(u32 ID, u32 _start, u32 _end) : CThread(ID, clMsg)
 	{
 		Nstart	= _start;
 		Nend	= _end;
@@ -574,7 +574,7 @@ void	xrCover	(bool pure_covers)
 
 	// Start threads, wait, continue --- perform all the work
 	u32	start_time		= timeGetTime();
-	CThreadManager		Threads;
+	CThreadManager		Threads(Status, Progress);
 	u32	stride			= g_nodes.size()/NUM_THREADS;
 	u32	last			= g_nodes.size()-stride*(NUM_THREADS-1);
 	for (u32 thID=0; thID<NUM_THREADS; thID++) {

src/utils/xrAI/compiler_cover.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "compiler.h"
 #include "xrCDB/Intersect.hpp"
-#include "xrThread.h"
+#include "utils/xrUtil/xrThread.hpp"
 #include <mmsystem.h>
 
 const int	LIGHT_Count			=2;
@@ -78,7 +78,7 @@ class	LightThread : public CThread
 {
 	u32	Nstart, Nend;
 public:
-	LightThread			(u32 ID, u32 _start, u32 _end) : CThread(ID)
+	LightThread			(u32 ID, u32 _start, u32 _end) : CThread(ID, clMsg)
 	{
 		Nstart	= _start;
 		Nend	= _end;

src/utils/xrAI/compiler_light.cpp

@@ -21,10 +21,11 @@ extern LPCSTR generate_temp_file_name			(LPCSTR header0, LPCSTR header1, string_
 
 #define NO_MULTITHREADING
 
-CGameSpawnConstructor::CGameSpawnConstructor	(LPCSTR name, LPCSTR output, LPCSTR start, bool no_separator_check)
+CGameSpawnConstructor::CGameSpawnConstructor	(LPCSTR name, LPCSTR output, LPCSTR start, bool no_separator_check) :
 #ifdef PROFILE_CRITICAL_SECTIONS
-	:m_critical_section(MUTEX_PROFILE_ID(CGameSpawnConstructor))
+	m_critical_section(MUTEX_PROFILE_ID(CGameSpawnConstructor)),
 #endif // PROFILE_CRITICAL_SECTIONS
+    m_thread_manager(Status, Progress)
 {
 	load_spawns						(name,no_separator_check);
 	process_spawns					();

src/utils/xrAI/game_spawn_constructor.cpp

@@ -10,7 +10,7 @@
 
 #include "alife_space.h"
 #include "xr_graph_merge.h"
-#include "xrthread.h"
+#include "utils/xrUtil/xrThread.hpp"
 #include "graph_abstract.h"
 #include "xrServer_Object_Base.h"
 #include "spawn_constructor_space.h"

src/utils/xrAI/game_spawn_constructor.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "xrthread.h"
+#include "utils/xrUtil/xrThread.hpp"
 #include "spawn_constructor_space.h"
 
 class CLevelGraph;

src/utils/xrAI/level_spawn_constructor.h

@@ -9,7 +9,7 @@
 #pragma once
 
 IC	CLevelSpawnConstructor::CLevelSpawnConstructor			(const CGameGraph::SLevel &level, CGameSpawnConstructor *game_spawn_constructor, bool no_separator_check) :
-	CThread						(level.id())
+	CThread						(level.id(), clMsg)
 {
 	m_level						= level;
 	m_game_spawn_constructor	= game_spawn_constructor;

src/utils/xrAI/level_spawn_constructor_inline.h

@@ -9,18 +9,20 @@
 #pragma once
 
 template <bool	 bEuclidianHeuristics = true>
-struct CVertexPath {
-
+struct CVertexPath
+{
 #pragma pack(push,1)
 	template <template <typename _T> class T1>
-	struct DataStoragePath {
-		struct _vertex : public T1<_vertex> {
-		};
+	struct DataStoragePath
+    {
+		struct _vertex : public T1<_vertex>
+        {};
 	};
 #pragma pack(pop)
 
 	template <template <typename _T> class _vertex> 
-	class CDataStorage {
+	class CDataStorage
+    {
 	public:
 		typedef typename DataStoragePath<_vertex>::_vertex	CGraphVertex;
 		typedef	typename CGraphVertex::_index_type			_index_type;

src/utils/xrAI/vertex_path.h

@@ -23,6 +23,7 @@
 #pragma comment(lib,"xrcdb.LIB")
 #pragma comment(lib,"MagicFM.LIB")
 #pragma comment(lib,"xrCore.LIB")
+#pragma comment(lib, "xrUtil.lib")
 
 extern LPCSTR LEVEL_GRAPH_NAME;
 

src/utils/xrAI/xrAI.cpp

@@ -303,7 +303,6 @@
     <ClCompile Include="verify_level_graph.cpp" />
     <ClCompile Include="xrAI.cpp" />
     <ClCompile Include="xrCrossTable.cpp" />
-    <ClCompile Include="xrThread.cpp" />
     <ClCompile Include="xr_graph_merge.cpp" />
     <ClCompile Include="_buildnodes_view.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -481,7 +480,6 @@
     <ClInclude Include="xrAI.h" />
     <ClInclude Include="xrCrossTable.h" />
     <ClInclude Include="xrShaderTypes.h" />
-    <ClInclude Include="xrThread.h" />
     <ClInclude Include="xr_graph_merge.h" />
     <ClInclude Include="_d3d_extensions.h" />
   </ItemGroup>