Linux: fixed thread detection

OpenXRay · Nov 8, 2018 · 81bc1e8 · 81bc1e8
1 parent 484bc0a
commit 81bc1e8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -68,12 +68,9 @@ inline char* _strupr_l(char* str, locale_t loc)
 
 #define __except(X) catch(X)
 
+#define tid_t pthread_t
 #define GetCurrentProcessId getpid
-
-inline pthread_t GetCurrentThreadId()
-{
-    return pthread_self();
-}
+#define GetCurrentThreadId pthread_self
 
 inline void Sleep(int ms)
 {

diff --git a/src/Common/PlatformWindows.inl b/src/Common/PlatformWindows.inl
@@ -35,3 +35,5 @@
 
 inline void convert_path_separators(char * path) {}
 inline void restore_path_separators(char * path) {}
+
+#define tid_t DWORD
diff --git a/src/xrEngine/xr_object_list.h b/src/xrEngine/xr_object_list.h
@@ -39,7 +39,7 @@ class ENGINE_API CObjectList
     Objects objects_active;
     Objects objects_sleeping;
     Objects m_crows[2];
-    u32 m_owner_thread_id;
+    tid_t m_owner_thread_id;
     ObjectUpdateStatistics stats;
     u32 statsFrame;
 

diff --git a/src/xrGame/Level_Bullet_Manager.cpp b/src/xrGame/Level_Bullet_Manager.cpp
@@ -183,7 +183,9 @@ void CBulletManager::AddBullet(const Fvector& position, const Fvector& direction
     float impulse, u16 sender_id, u16 sendersweapon_id, ALife::EHitType e_hit_type, float maximum_distance,
     const CCartridge& cartridge, float const air_resistance_factor, bool SendHit, bool AimBullet)
 {
+#ifdef DEBUG
     VERIFY(m_thread_id == GetCurrentThreadId());
+#endif
 
     VERIFY(u16(-1) != cartridge.bullet_material_idx);
     //	u32 CurID					= Level().CurrentControlEntity()->ID();
@@ -206,7 +208,9 @@ void CBulletManager::AddBullet(const Fvector& position, const Fvector& direction
 
 void CBulletManager::UpdateWorkload()
 {
-    //	VERIFY						( m_thread_id == GetCurrentThreadId() );
+#ifdef DEBUG
+    VERIFY						( m_thread_id == GetCurrentThreadId() );
+#endif
 
     rq_storage.r_clear();
 

diff --git a/src/xrGame/Level_Bullet_Manager.h b/src/xrGame/Level_Bullet_Manager.h
@@ -137,7 +137,7 @@ class CBulletManager
     xr_vector<_event> m_Events;
 
 #ifdef DEBUG
-    u32 m_thread_id;
+    tid_t m_thread_id;
 
     typedef xr_vector<Fvector> BulletPoints;
     BulletPoints m_bullet_points;