From c56bc4b01c913febd2f062f17aff63e3415eb26c Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 21 Sep 2013 20:44:16 +0200
Subject: Fixed Linux threading issues.

---
 source/OSSupport/IsThread.cpp | 14 +++-----------
 source/OSSupport/IsThread.h   |  3 +--
 source/RCONServer.cpp         |  4 ++--
 source/Server.cpp             |  4 ++--
 4 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'source')

diff --git a/source/OSSupport/IsThread.cpp b/source/OSSupport/IsThread.cpp
index d5fbfcf19..e1ef84c17 100644
--- a/source/OSSupport/IsThread.cpp
+++ b/source/OSSupport/IsThread.cpp
@@ -53,11 +53,7 @@ static void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName)
 cIsThread::cIsThread(const AString & iThreadName) :
 	m_ThreadName(iThreadName),
 	m_ShouldTerminate(false),
-	#ifdef _WIN32
-		m_Handle(NULL)
-	#else  // _WIN32
-		m_HasStarted(false)
-	#endif  // else _WIN32
+	m_Handle(NULL)
 {
 }
 
@@ -77,9 +73,9 @@ cIsThread::~cIsThread()
 
 bool cIsThread::Start(void)
 {
+	ASSERT(m_Handle == NULL);  // Has already started one thread?
+	
 	#ifdef _WIN32
-		ASSERT(m_Handle == NULL);  // Has already started one thread?
-		
 		// Create the thread suspended, so that the mHandle variable is valid in the thread procedure
 		DWORD ThreadID = 0;
 		m_Handle = CreateThread(NULL, 0, thrExecute, this, CREATE_SUSPENDED, &ThreadID);
@@ -99,14 +95,11 @@ bool cIsThread::Start(void)
 		#endif  // _DEBUG and _MSC_VER
 		
 	#else  // _WIN32
-		ASSERT(!m_HasStarted);
-		
 		if (pthread_create(&m_Handle, NULL, thrExecute, this))
 		{
 			LOGERROR("ERROR: Could not create thread \"%s\", !", m_ThreadName.c_str());
 			return false;
 		}
-		m_HasStarted = true;
 	#endif  // else _WIN32
 
 	return true;
@@ -158,7 +151,6 @@ bool cIsThread::Wait(void)
 			LOGD("Thread %s finished", m_ThreadName.c_str());
 		#endif  // LOGD
 		
-		m_HasStarted = false;
 		return (res == 0);
 	#endif  // else _WIN32
 }
diff --git a/source/OSSupport/IsThread.h b/source/OSSupport/IsThread.h
index 9b7f0b73e..2ea8bf6f9 100644
--- a/source/OSSupport/IsThread.h
+++ b/source/OSSupport/IsThread.h
@@ -48,7 +48,7 @@ public:
 	/// Returns the OS-dependent thread ID for the caller's thread
 	static unsigned long GetCurrentID(void);
 
-private:
+protected:
 	AString m_ThreadName;
 	
 	#ifdef _WIN32
@@ -66,7 +66,6 @@ private:
 	#else  // _WIN32
 	
 		pthread_t m_Handle;
-		bool      m_HasStarted;
 		
 		static void * thrExecute(void * a_Param)
 		{
diff --git a/source/RCONServer.cpp b/source/RCONServer.cpp
index 04c06c887..93f2ccdd3 100644
--- a/source/RCONServer.cpp
+++ b/source/RCONServer.cpp
@@ -78,8 +78,8 @@ protected:
 
 cRCONServer::cRCONServer(cServer & a_Server) :
 	m_Server(a_Server),
-	m_ListenThread4(*this, cSocket::IPv4, "RCON"),
-	m_ListenThread6(*this, cSocket::IPv6, "RCON")
+	m_ListenThread4(*this, cSocket::IPv4, "RCON IPv4"),
+	m_ListenThread6(*this, cSocket::IPv6, "RCON IPv6")
 {
 }
 
diff --git a/source/Server.cpp b/source/Server.cpp
index dd18f8d3d..e73580e79 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -103,8 +103,8 @@ void cServer::cTickThread::Execute(void)
 // cServer:
 
 cServer::cServer(void) :
-	m_ListenThreadIPv4(*this, cSocket::IPv4, "Client"),
-	m_ListenThreadIPv6(*this, cSocket::IPv6, "Client"),
+	m_ListenThreadIPv4(*this, cSocket::IPv4, "Client IPv4"),
+	m_ListenThreadIPv6(*this, cSocket::IPv6, "Client IPv6"),
 	m_bIsConnected(false),
 	m_bRestarting(false),
 	m_RCONServer(*this),
-- 
cgit v1.2.3