Refactor and update sync primitives.

OpenXRay · Oct 20, 2015 · a1461ce · a1461ce
1 parent f0109a3
commit a1461ce
Show file tree

Hide file tree

Showing 58 changed files with 231 additions and 218 deletions.
diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h
@@ -183,7 +183,7 @@ class ECORE_API CDetailManager
 	void							Render			();
 
 	/// MT stuff
-	xrCriticalSection				MT;
+	Lock				MT;
 	volatile u32					m_frame_calc;
 	volatile u32					m_frame_rendered;
 

diff --git a/src/Layers/xrRender/HOM.h b/src/Layers/xrRender/HOM.h
@@ -39,7 +39,7 @@ class CHOM
 	Fmatrix					m_xform;
 	Fmatrix					m_xform_01;
 
-	xrCriticalSection		MT;
+	Lock		MT;
 	volatile u32			MT_frame_rendered;
     HOMStatistics stats;
 

diff --git a/src/Layers/xrRender/SkeletonCustom.cpp b/src/Layers/xrRender/SkeletonCustom.cpp
@@ -9,7 +9,7 @@
 #include	"xrEngine/Render.h"
 #endif
 int			psSkeletonUpdate	= 32;
-xrCriticalSection	UCalc_Mutex
+Lock	UCalc_Mutex
 #ifdef PROFILE_CRITICAL_SECTIONS
 	(MUTEX_PROFILE_ID(UCalc_Mutex))
 #endif // PROFILE_CRITICAL_SECTIONS

diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h
@@ -7,7 +7,7 @@
 #include		"Include/xrRender/Kinematics.h"
 
 // consts
-extern	xrCriticalSection	UCalc_Mutex			;
+extern	Lock	UCalc_Mutex			;
 
 // refs
 class	 CKinematics;

diff --git a/src/Layers/xrRender/WallmarksEngine.h b/src/Layers/xrRender/WallmarksEngine.h
@@ -39,7 +39,7 @@ class CWallmarksEngine
 	CDB::Collector		sml_collector;
 	xr_vector<u32>		sml_adjacency;
 
-	xrCriticalSection	lock;
+	Lock	lock;
 private:
 	wm_slot*			FindSlot				(ref_shader shader);
 	wm_slot*			AppendSlot				(ref_shader shader);

diff --git a/src/utils/xrAI/game_spawn_constructor.h b/src/utils/xrAI/game_spawn_constructor.h
@@ -41,7 +41,7 @@ class CGameSpawnConstructor {
 	};
 
 private:
-	xrCriticalSection				m_critical_section;
+	Lock				m_critical_section;
 	ALife::_SPAWN_ID				m_spawn_id;
 	CThreadManager					m_thread_manager;
 	CSpawnHeader					m_spawn_header;

diff --git a/src/utils/xrAI/profiler.h b/src/utils/xrAI/profiler.h
@@ -62,7 +62,7 @@ class CProfiler {
 	PORTIONS			m_portions;
 	TIMERS				m_timers;
 	bool				m_actual;
-	xrCriticalSection	m_section;
+	Lock	m_section;
 	u32					m_call_count;
 
 protected:

diff --git a/src/utils/xrLC/OGF_Face.cpp b/src/utils/xrLC/OGF_Face.cpp
@@ -256,7 +256,7 @@ void OGF::Optimize	()
 
 
 // Make Progressive
-xrCriticalSection			progressive_cs
+Lock			progressive_cs
 #ifdef PROFILE_CRITICAL_SECTIONS
 	(MUTEX_PROFILE_ID(progressive_cs))
 #endif // PROFILE_CRITICAL_SECTIONS

diff --git a/src/utils/xrLC/xrLight.cpp b/src/utils/xrLC/xrLight.cpp
@@ -6,12 +6,12 @@
 #include "utils/xrLC_Light/xrLC_GlobalData.h"
 #include "utils/xrLC_Light/xrLightVertex.h"
 
-#include "xrCore/Threading/xrSyncronize.h"
+#include "xrCore/Threading/Lock.hpp"
 #include "net.h"
 
 #include "utils/xrLC_Light/lcnet_task_manager.h"
 #include "utils/xrLC_Light/mu_model_light.h"
-xrCriticalSection	task_CS
+Lock	task_CS
 #ifdef PROFILE_CRITICAL_SECTIONS
 	(MUTEX_PROFILE_ID(task_C_S))
 #endif // PROFILE_CRITICAL_SECTIONS

diff --git a/src/utils/xrLC/xrPhase_GI.cpp b/src/utils/xrLC/xrPhase_GI.cpp
@@ -5,7 +5,7 @@
 #include "utils/xrLC_Light/xrLC_GlobalData.h"
 #include "utils/xrLC_Light/xrface.h"
 
-#include "xrCore/Threading/xrSyncronize.h"
+#include "xrCore/Threading/Lock.hpp"
 #include "xrCDB/xrCDB.h"
 
 
@@ -17,7 +17,7 @@ const	float			gi_clip				= 0.05f;
 const	u32				gi_maxlevel			= 4;
 //////////////////////////////////////////////////////////////////////////
 static xr_vector<R_Light>*		task;
-xrCriticalSection		task_cs
+Lock		task_cs
 #ifdef PROFILE_CRITICAL_SECTIONS
 	(MUTEX_PROFILE_ID(task_cs))
 #endif // PROFILE_CRITICAL_SECTIONS

diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerWindow.hpp b/src/utils/xrLCUtil/LevelCompilerLoggerWindow.hpp
@@ -13,7 +13,7 @@ class XRLCUTIL_API LevelCompilerLoggerWindow : public ILevelCompilerLogger
     HWND hwTime = 0;
     HWND hwPText = 0;
     HWND hwPhaseTime = 0;
-    xrCriticalSection csLog
+    Lock csLog
 #ifdef PROFILE_CRITICAL_SECTIONS
         (MUTEX_PROFILE_ID(csLog))
 #endif

diff --git a/src/utils/xrLC_Light/lcnet_task_manager.h b/src/utils/xrLC_Light/lcnet_task_manager.h
@@ -29,9 +29,9 @@ namespace	lc_net
 		DWORD						session_id;
 		u32							tasks_completed;
 		bool						_release;
-		xrCriticalSection			pool_lock;
-		xrCriticalSection			log_lock;
-		xrCriticalSection			init_lock;
+		Lock			pool_lock;
+		Lock			log_lock;
+		Lock			init_lock;
 	private:
 		void			send_task			( IGridUser& user, u32 id  );
 		void			receive_result		( IGenericStream* inStream );

diff --git a/src/utils/xrLC_Light/mu_model_light_threads.cpp b/src/utils/xrLC_Light/mu_model_light_threads.cpp
@@ -14,7 +14,7 @@
 
 
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "xrCore/Threading/xrSyncronize.h"
+#include "xrCore/Threading/Lock.hpp"
 
 
 
@@ -23,7 +23,7 @@ CThreadManager			mu_secondary(ProxyStatus, ProxyProgress);
 #define		MU_THREADS	4
 // mu-light
 bool mu_models_local_calc_lightening = false;
-xrCriticalSection		mu_models_local_calc_lightening_wait_lock;
+Lock		mu_models_local_calc_lightening_wait_lock;
 void WaitMuModelsLocalCalcLightening()
 {
 	for(;;)

diff --git a/src/utils/xrLC_Light/net_cl_data_prepare.cpp b/src/utils/xrLC_Light/net_cl_data_prepare.cpp
@@ -9,12 +9,12 @@
 #include "xrlc_globaldata.h"
 #include "mu_light_net.h"
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "xrCore/Threading/xrSyncronize.h"
+#include "xrCore/Threading/Lock.hpp"
 
 bool					global_compile_data_initialized = false;
 bool					base_global_compile_data_initialized = false;
 CThreadManager			cl_data_prepare(ProxyStatus, ProxyProgress);
-xrCriticalSection		wait_lock;
+Lock		wait_lock;
 void		SetBaseGlobalCompileDataInitialized( );
 class NetCompileDetaPrepare	: public CThread
 {

diff --git a/src/utils/xrLC_Light/net_exec_pool.cpp b/src/utils/xrLC_Light/net_exec_pool.cpp
@@ -150,7 +150,7 @@ namespace lc_net
 		return *this;
 	}
 	void __cdecl Finalize(IGenericStream* outStream);
-	xrCriticalSection run_task_lock;
+	Lock run_task_lock;
 	void	exec_pool::send_task( IGridUser& user, IGenericStream* Stream, u8 pool_id, u32 id  )
 	{
 

diff --git a/src/utils/xrLC_Light/net_exec_pool.h b/src/utils/xrLC_Light/net_exec_pool.h
@@ -13,8 +13,8 @@ namespace lc_net
 		u32							_start;
 		u32							_end;
 		u32							tasks_completed;
-		xrCriticalSection			send_receive_lock;
-		xrCriticalSection			run_lock;
+		Lock			send_receive_lock;
+		Lock			run_lock;
 		xr_vector<net_execution*>	pool;
 		CTimer						start_time;
 		task_manager				&_task_manager;

diff --git a/src/utils/xrLC_Light/net_global_data.cpp b/src/utils/xrLC_Light/net_global_data.cpp
@@ -42,8 +42,8 @@ bool	global_data_file_path(LPCSTR name, IAgent* agent, DWORD sessionId, string_p
 		//net_global_data_impl<gl_type>	impl;
 
 
-		xrCriticalSection	create_data_lock;
-		xrCriticalSection	ref_lock;
+		Lock	create_data_lock;
+		Lock	ref_lock;
 		u32					_id;
 		u32					_use_count;
 		bool				_clear;

diff --git a/src/utils/xrLC_Light/net_global_data_cleanup.h b/src/utils/xrLC_Light/net_global_data_cleanup.h
@@ -10,7 +10,7 @@ namespace lc_net
 
 		u32						id_state	;				
 		xr_vector<u32>			vec_cleanup	;
-		xrCriticalSection		lock;
+		Lock		lock;
 		friend					void  data_cleanup_callback( const char* dataDesc, IGenericStream** stream );
 	public:
 				global_data_cleanup		(  );

diff --git a/src/utils/xrLC_Light/net_light.cpp b/src/utils/xrLC_Light/net_light.cpp
@@ -13,7 +13,7 @@
 //==============================================================================
 
 
-static xrCriticalSection	block;
+static Lock	block;
 LPCSTR dataDesc  = "global_data";
 
 xr_vector<u32>	net_pool;

diff --git a/src/utils/xrLC_Light/net_task_manager.cpp b/src/utils/xrLC_Light/net_task_manager.cpp
@@ -69,7 +69,7 @@ get_net_task_manager()->receive( r );
 
 }
 
-static xrCriticalSection send_receive_data_lock;
+static Lock send_receive_data_lock;
 class INetFileBuffWriter;
 static INetFileBuffWriter *gl_data_write = 0;
 static CVirtualFileRW *g_net_data = 0;

diff --git a/src/utils/xrLC_Light/xrLightVertex.cpp b/src/utils/xrLC_Light/xrLightVertex.cpp
@@ -10,7 +10,7 @@
 typedef	xr_multimap<float,vecVertex>	mapVert;
 typedef	mapVert::iterator				mapVertIt;
 mapVert*								g_trans;
-xrCriticalSection						g_trans_CS
+Lock						g_trans_CS
 #ifdef PROFILE_CRITICAL_SECTIONS
 	(MUTEX_PROFILE_ID(g_trans_CS))
 #endif // PROFILE_CRITICAL_SECTIONS
@@ -63,7 +63,7 @@ void	g_trans_register	(Vertex* V)
 const u32				VLT_END		= u32(-1);
 class CVertexLightTasker
 {
-	xrCriticalSection	cs;
+	Lock	cs;
 	volatile u32		index;	
 public:
 	CVertexLightTasker	() : index(0)

diff --git a/src/utils/xrLC_Light/xrLight_Implicit.cpp b/src/utils/xrLC_Light/xrLight_Implicit.cpp
@@ -156,7 +156,7 @@ void ImplicitLighting(BOOL b_net)
 	thread_spawn	(ImplicitLightingTreadNetExec,"worker-thread",1024*1024,0);
 
 }
-xrCriticalSection implicit_net_lock;
+Lock implicit_net_lock;
 void XRLC_LIGHT_API ImplicitNetWait()
 {
 	implicit_net_lock.Enter();

diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h
@@ -186,7 +186,7 @@ class XRCDB_API	ISpatial_DB
         }
     };
 private:
-	xrCriticalSection				cs;
+	Lock				cs;
 
 	poolSS< ISpatial_NODE, 128 >	allocator;
 

diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
@@ -62,7 +62,7 @@ namespace CDB
 			S_forcedword		= u32(-1)
 		};
 	private:
-		xrCriticalSection		cs;
+		Lock		cs;
 		Opcode::OPCODE_Model*	tree;
 		u32						status;		// 0=ready, 1=init, 2=building
 
@@ -86,7 +86,7 @@ namespace CDB
 			if (S_READY!=status)
 			{
 				Log						("! WARNING: syncronized CDB::query");
-				xrCriticalSection*	C	= (xrCriticalSection*) &cs;
+				Lock*	C	= (Lock*) &cs;
 				C->Enter				();
 				C->Leave				();
 			}

diff --git a/src/xrCDB/xr_area.h b/src/xrCDB/xr_area.h
@@ -23,7 +23,7 @@ class	XRCDB_API						CObjectSpace
 {
 private:
 	// Debug
-	xrCriticalSection					Lock;
+	Lock					Lock;
 	CDB::MODEL							Static;
 	Fbox								m_BoundingVolume;
 	xrXRC								xrc;				// MT: dangerous

diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp
@@ -122,7 +122,7 @@ void setup_reader(IReader* _r, _open_file& _of)
 template <typename T>
 void _register_open_file(T* _r, LPCSTR _fname)
 {
-    xrCriticalSection _lock;
+    Lock _lock;
     _lock.Enter();
 
     shared_str f = _fname;
@@ -138,7 +138,7 @@ void _register_open_file(T* _r, LPCSTR _fname)
 template <typename T>
 void _unregister_open_file(T* _r)
 {
-    xrCriticalSection _lock;
+    Lock _lock;
     _lock.Enter();
 
     xr_vector<_open_file>::iterator it = std::find_if(g_open_files.begin(), g_open_files.end(), eq_pointer<T>(_r));

diff --git a/src/xrCore/LocatorAPI.h b/src/xrCore/LocatorAPI.h
@@ -90,7 +90,7 @@ class XRCORE_API CLocatorAPI
     files_set m_files;
     BOOL bNoRecurse;
 
-    xrCriticalSection m_auth_lock;
+    Lock m_auth_lock;
     u64 m_auth_code;
 
     const file* RegisterExternal(const char* name);

diff --git a/src/xrCore/Threading/Event.cpp b/src/xrCore/Threading/Event.cpp
@@ -0,0 +1,16 @@
+#include "stdafx.h"
+#include "Event.hpp"
+#include <windows.h>
+
+Event::Event() { handle = (void*)CreateEvent(NULL, FALSE, FALSE, NULL); }
+
+Event::~Event() { CloseHandle(handle); }
+
+void Event::Reset() { ResetEvent(handle); }
+
+void Event::Set() { SetEvent(handle); }
+
+void Event::Wait() const { WaitForSingleObject(handle, INFINITE); }
+
+bool Event::Wait(u32 millisecondsTimeout) const
+{ return WaitForSingleObject(handle, millisecondsTimeout)!=WAIT_TIMEOUT; }
diff --git a/src/xrCore/Threading/Event.hpp b/src/xrCore/Threading/Event.hpp
@@ -0,0 +1,23 @@
+#pragma once
+#include "xrCore/xrCore.h"
+
+class XRCORE_API Event
+{
+private:
+    void *handle;
+
+public:
+    Event();
+    ~Event();
+
+    // Reset the event to the unsignalled state.
+    void Reset();
+    // Set the event to the signalled state.
+    void Set();
+    // Wait indefinitely for the object to become signalled.
+    void Wait() const;
+    // Wait, with a time limit, for the object to become signalled. 
+    bool Wait(u32 millisecondsTimeout) const;
+
+    void *GetHandle() const { return handle; }
+};