From 6d5a8892f34f4034b38da467268de9d489e1024e Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 19 Oct 2014 00:29:34 +0100
Subject: Use std::thread

---
 src/OSSupport/CMakeLists.txt      |   2 -
 src/OSSupport/CriticalSection.cpp |   4 +-
 src/OSSupport/CriticalSection.h   |   2 +-
 src/OSSupport/IsThread.cpp        | 158 +++++++-------------------------------
 src/OSSupport/IsThread.h          |  44 +----------
 src/OSSupport/Thread.cpp          | 137 ---------------------------------
 src/OSSupport/Thread.h            |  26 -------
 7 files changed, 34 insertions(+), 339 deletions(-)
 delete mode 100644 src/OSSupport/Thread.cpp
 delete mode 100644 src/OSSupport/Thread.h

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index 429949c59..1c8da5ddd 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -16,7 +16,6 @@ SET (SRCS
 	Sleep.cpp
 	Socket.cpp
 	SocketThreads.cpp
-	Thread.cpp
 	Timer.cpp)
 
 SET (HDRS
@@ -32,7 +31,6 @@ SET (HDRS
 	Sleep.h
 	Socket.h
 	SocketThreads.h
-	Thread.h
 	Timer.h)
 
 if(NOT MSVC)
diff --git a/src/OSSupport/CriticalSection.cpp b/src/OSSupport/CriticalSection.cpp
index 5dfc8b5f9..3e8e7498d 100644
--- a/src/OSSupport/CriticalSection.cpp
+++ b/src/OSSupport/CriticalSection.cpp
@@ -59,7 +59,7 @@ void cCriticalSection::Lock()
 	
 	#ifdef _DEBUG
 		m_IsLocked += 1;
-		m_OwningThreadID = cIsThread::GetCurrentID();
+		m_OwningThreadID = std::this_thread::get_id();
 	#endif  // _DEBUG
 }
 
@@ -97,7 +97,7 @@ bool cCriticalSection::IsLocked(void)
 
 bool cCriticalSection::IsLockedByCurrentThread(void)
 {
-	return ((m_IsLocked > 0) && (m_OwningThreadID == cIsThread::GetCurrentID()));
+	return ((m_IsLocked > 0) && (m_OwningThreadID == std::this_thread::get_id()));
 }
 #endif  // _DEBUG
 
diff --git a/src/OSSupport/CriticalSection.h b/src/OSSupport/CriticalSection.h
index c3c6e57f0..7822a5471 100644
--- a/src/OSSupport/CriticalSection.h
+++ b/src/OSSupport/CriticalSection.h
@@ -27,7 +27,7 @@ public:
 private:
 	#ifdef _DEBUG
 	int           m_IsLocked;  // Number of times this CS is locked
-	unsigned long m_OwningThreadID;
+	std::thread::id m_OwningThreadID;
 	#endif  // _DEBUG
 	
 	#ifdef _WIN32
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 1a436623a..4864ef28b 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -5,65 +5,18 @@
 // This class will eventually suupersede the old cThread class
 
 #include "Globals.h"
-
 #include "IsThread.h"
 
 
 
 
 
-// When in MSVC, the debugger provides "thread naming" by catching special exceptions. Interface here:
-#if defined(_MSC_VER) && defined(_DEBUG)
-//
-// Usage: SetThreadName (-1, "MainThread");
-//
-
-// Code adapted from MSDN: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
-
-const DWORD MS_VC_EXCEPTION = 0x406D1388;
-
-#pragma pack(push, 8)
-typedef struct tagTHREADNAME_INFO
-{
-	DWORD  dwType;      // Must be 0x1000.
-	LPCSTR szName;      // Pointer to name (in user addr space).
-	DWORD  dwThreadID;  // Thread ID (-1 = caller thread).
-	DWORD  dwFlags;     // Reserved for future use, must be zero.
-} THREADNAME_INFO;
-#pragma pack(pop)
-
-static void SetThreadName(DWORD dwThreadID, const char * threadName)
-{
-	THREADNAME_INFO info;
-	info.dwType = 0x1000;
-	info.szName = threadName;
-	info.dwThreadID = dwThreadID;
-	info.dwFlags = 0;
-
-	__try
-	{
-		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info);
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-	}
-}
-#endif  // _MSC_VER && _DEBUG
-
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // cIsThread:
 
-cIsThread::cIsThread(const AString & iThreadName) :
+cIsThread::cIsThread(const AString & a_ThreadName) :
 	m_ShouldTerminate(false),
-	m_ThreadName(iThreadName),
-	#ifdef _WIN32
-		m_ThreadID(0),
-	#endif
-	m_Handle(NULL_HANDLE)
+	m_ThreadName(a_ThreadName)
 {
 }
 
@@ -83,35 +36,16 @@ cIsThread::~cIsThread()
 
 bool cIsThread::Start(void)
 {
-	ASSERT(m_Handle == NULL_HANDLE);  // Has already started one thread?
-	#ifdef _WIN32
-		// Create the thread suspended, so that the mHandle variable is valid in the thread procedure
-		m_ThreadID = 0;
-		m_Handle = CreateThread(NULL, 0, thrExecute, this, CREATE_SUSPENDED, &m_ThreadID);
-		if (m_Handle == NULL)
-		{
-			LOGERROR("ERROR: Could not create thread \"%s\", GLE = %u!", m_ThreadName.c_str(), (unsigned)GetLastError());
-			return false;
-		}
-		ResumeThread(m_Handle);
-
-		#if defined(_DEBUG) && defined(_MSC_VER)
-			// Thread naming is available only in MSVC
-			if (!m_ThreadName.empty())
-			{
-				SetThreadName(m_ThreadID, m_ThreadName.c_str());
-			}
-		#endif  // _DEBUG and _MSC_VER
-		
-	#else  // _WIN32
-		if (pthread_create(&m_Handle, NULL, thrExecute, this))
-		{
-			LOGERROR("ERROR: Could not create thread \"%s\", !", m_ThreadName.c_str());
-			return false;
-		}
-	#endif  // else _WIN32
-
-	return true;
+	try
+	{
+		m_Thread = std::thread(&cIsThread::Execute, this);
+		return true;
+	}
+	catch (std::system_error & a_Exception)
+	{
+		LOGERROR("ERROR: Could not create thread \"%s\", error = %s!", m_ThreadName.c_str(), a_Exception.code(), a_Exception.what());
+		return false;
+	}
 }
 
 
@@ -120,10 +54,6 @@ bool cIsThread::Start(void)
 
 void cIsThread::Stop(void)
 {
-	if (m_Handle == NULL_HANDLE)
-	{
-		return;
-	}
 	m_ShouldTerminate = true;
 	Wait();
 }
@@ -133,60 +63,30 @@ void cIsThread::Stop(void)
 
 
 bool cIsThread::Wait(void)
-{
-	if (m_Handle == NULL_HANDLE)
-	{
-		return true;
-	}
-	
+{	
 	#ifdef LOGD  // ProtoProxy doesn't have LOGD
 		LOGD("Waiting for thread %s to finish", m_ThreadName.c_str());
 	#endif  // LOGD
-	
-	#ifdef _WIN32
-		int res = WaitForSingleObject(m_Handle, INFINITE);
-		m_Handle = NULL;
-		
-		#ifdef LOGD  // ProtoProxy doesn't have LOGD
-			LOGD("Thread %s finished", m_ThreadName.c_str());
-		#endif  // LOGD
-		
-		return (res == WAIT_OBJECT_0);
-	#else  // _WIN32
-		int res = pthread_join(m_Handle, NULL);
-		m_Handle = NULL_HANDLE;
-		
-		#ifdef LOGD  // ProtoProxy doesn't have LOGD
-			LOGD("Thread %s finished", m_ThreadName.c_str());
-		#endif  // LOGD
-		
-		return (res == 0);
-	#endif  // else _WIN32
-}
-
-
-
 
+	if (m_Thread.joinable())
+	{
+		try
+		{
+			m_Thread.join();
+			return true;
+		}
+		catch (std::system_error & a_Exception)
+		{
+			LOGERROR("ERROR: Could wait for thread \"%s\" to finish, error = %s!", m_ThreadName.c_str(), a_Exception.code(), a_Exception.what());
+			return false;
+		}
+	}
 
-unsigned long cIsThread::GetCurrentID(void)
-{
-	#ifdef _WIN32
-		return (unsigned long) GetCurrentThreadId();
-	#else
-		return (unsigned long) pthread_self();
+	#ifdef LOGD  // ProtoProxy doesn't have LOGD
+		LOGD("Thread %s finished", m_ThreadName.c_str());
 	#endif
-}
-
-
-
 
-bool cIsThread::IsCurrentThread(void) const
-{
-	#ifdef _WIN32
-		return (GetCurrentThreadId() == m_ThreadID);
-	#else
-		return (m_Handle == pthread_self());
-	#endif
+	return true;
 }
 
 
diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h
index 5de5f31c4..8dfad84cb 100644
--- a/src/OSSupport/IsThread.h
+++ b/src/OSSupport/IsThread.h
@@ -44,53 +44,13 @@ public:
 	
 	/// Waits for the thread to finish. Doesn't signalize the ShouldTerminate flag
 	bool Wait(void);
-	
-	/// Returns the OS-dependent thread ID for the caller's thread
-	static unsigned long GetCurrentID(void);
 
 	/** Returns true if the thread calling this function is the thread contained within this object. */
-	bool IsCurrentThread(void) const;
+	bool IsCurrentThread(void) const { return std::this_thread::get_id() == m_Thread.get_id(); }
 
 protected:
 	AString m_ThreadName;
-	
-	// Value used for "no handle":
-	#ifdef _WIN32
-		#define NULL_HANDLE NULL
-	#else
-		#define NULL_HANDLE 0
-	#endif
-
-	#ifdef _WIN32
-	
-		DWORD m_ThreadID;
-		HANDLE m_Handle;
-		
-		static DWORD __stdcall thrExecute(LPVOID a_Param)
-		{
-			// Create a window so that the thread can be identified by 3rd party tools:
-			HWND IdentificationWnd = CreateWindowA("STATIC", ((cIsThread *)a_Param)->m_ThreadName.c_str(), 0, 0, 0, 0, WS_OVERLAPPED, NULL, NULL, NULL, NULL);
-			
-			// Run the thread:
-			((cIsThread *)a_Param)->Execute();
-			
-			// Destroy the identification window:
-			DestroyWindow(IdentificationWnd);
-			
-			return 0;
-		}
-		
-	#else  // _WIN32
-	
-		pthread_t m_Handle;
-		
-		static void * thrExecute(void * a_Param)
-		{
-			((cIsThread *)a_Param)->Execute();
-			return NULL;
-		}
-		
-	#endif  // else _WIN32
+	std::thread m_Thread;
 } ;
 
 
diff --git a/src/OSSupport/Thread.cpp b/src/OSSupport/Thread.cpp
deleted file mode 100644
index faaccce96..000000000
--- a/src/OSSupport/Thread.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-
-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-
-
-
-
-
-// When in MSVC, the debugger provides "thread naming" by catching special exceptions. Interface here:
-#ifdef _MSC_VER
-//
-// Usage: SetThreadName (-1, "MainThread");
-//
-
-// Code adapted from MSDN: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
-
-const DWORD MS_VC_EXCEPTION = 0x406D1388;
-
-#pragma pack(push, 8)
-typedef struct tagTHREADNAME_INFO
-{
-	DWORD  dwType;      // Must be 0x1000.
-	LPCSTR szName;      // Pointer to name (in user addr space).
-	DWORD  dwThreadID;  // Thread ID (-1 = caller thread).
-	DWORD  dwFlags;     // Reserved for future use, must be zero.
-} THREADNAME_INFO;
-#pragma pack(pop)
-
-static void SetThreadName(DWORD dwThreadID, const char * threadName)
-{
-	THREADNAME_INFO info;
-	info.dwType = 0x1000;
-	info.szName = threadName;
-	info.dwThreadID = dwThreadID;
-	info.dwFlags = 0;
-
-	__try
-	{
-		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info);
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-	}
-}
-#endif  // _MSC_VER
-
-
-
-
-
-cThread::cThread( ThreadFunc a_ThreadFunction, void* a_Param, const char* a_ThreadName /* = 0 */)
-	: m_ThreadFunction( a_ThreadFunction)
-	, m_Param( a_Param)
-	, m_Event( new cEvent())
-	, m_StopEvent( 0)
-{
-	if (a_ThreadName)
-	{
-		m_ThreadName.assign(a_ThreadName);
-	}
-}
-
-
-
-
-
-cThread::~cThread()
-{
-	delete m_Event;
-	m_Event = NULL;
-	
-	if (m_StopEvent)
-	{
-		m_StopEvent->Wait();
-		delete m_StopEvent;
-		m_StopEvent = NULL;
-	}
-}
-
-
-
-
-
-void cThread::Start( bool a_bWaitOnDelete /* = true */)
-{
-	if (a_bWaitOnDelete)
-		m_StopEvent = new cEvent();
-
-#ifndef _WIN32
-	pthread_t SndThread;
-	if (pthread_create( &SndThread, NULL, MyThread, this))
-		LOGERROR("ERROR: Could not create thread!");
-#else
-	DWORD ThreadID = 0;
-	HANDLE hThread = CreateThread(NULL  // security
-		, 0  // stack size
-		, (LPTHREAD_START_ROUTINE) MyThread  // function name
-		, this  // parameters
-		, 0  // flags
-		, &ThreadID);  // thread id
-	CloseHandle( hThread);
-
-	#ifdef _MSC_VER
-	if (!m_ThreadName.empty())
-	{
-		SetThreadName(ThreadID, m_ThreadName.c_str());
-	}
-	#endif  // _MSC_VER
-#endif
-
-	// Wait until thread has actually been created
-	m_Event->Wait();
-}
-
-
-
-
-
-#ifdef _WIN32
-unsigned long cThread::MyThread(void* a_Param)
-#else
-void *cThread::MyThread( void *a_Param)
-#endif
-{
-	cThread* self = (cThread*)a_Param;
-	cEvent* StopEvent = self->m_StopEvent;
-
-	ThreadFunc* ThreadFunction = self->m_ThreadFunction;
-	void* ThreadParam = self->m_Param;
-
-	// Set event to let other thread know this thread has been created and it's safe to delete the cThread object
-	self->m_Event->Set();
-
-	ThreadFunction( ThreadParam);
-
-	if (StopEvent) StopEvent->Set();
-	return 0;
-}
diff --git a/src/OSSupport/Thread.h b/src/OSSupport/Thread.h
deleted file mode 100644
index 7ee352c82..000000000
--- a/src/OSSupport/Thread.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-class cThread
-{
-public:
-	typedef void (ThreadFunc)(void*);
-	cThread( ThreadFunc a_ThreadFunction, void* a_Param, const char* a_ThreadName = 0);
-	~cThread();
-
-	void Start( bool a_bWaitOnDelete = true);
-	void WaitForThread();
-private:
-	ThreadFunc* m_ThreadFunction;
-
-#ifdef _WIN32
-	static unsigned long MyThread(void* a_Param);
-#else
-	static void *MyThread( void *lpParam);
-#endif
-
-	void* m_Param;
-	cEvent* m_Event;
-	cEvent* m_StopEvent;
-
-	AString m_ThreadName;
-};
-- 
cgit v1.2.3


From bde99d684e0bb51adaa053a240abe61cf4af07fb Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 20 Oct 2014 18:59:40 +0100
Subject: Migrated cSleep and cTimer to std::chrono

---
 src/OSSupport/CMakeLists.txt |  2 --
 src/OSSupport/IsThread.h     |  2 +-
 src/OSSupport/Sleep.cpp      | 19 -------------------
 src/OSSupport/Sleep.h        |  7 -------
 src/OSSupport/Timer.cpp      | 37 -------------------------------------
 src/OSSupport/Timer.h        | 32 --------------------------------
 6 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 src/OSSupport/Sleep.cpp
 delete mode 100644 src/OSSupport/Sleep.h
 delete mode 100644 src/OSSupport/Timer.cpp
 delete mode 100644 src/OSSupport/Timer.h

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index 1c8da5ddd..45df0c1a3 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -13,7 +13,6 @@ SET (SRCS
 	IsThread.cpp
 	ListenThread.cpp
 	Semaphore.cpp
-	Sleep.cpp
 	Socket.cpp
 	SocketThreads.cpp
 	Timer.cpp)
@@ -28,7 +27,6 @@ SET (HDRS
 	ListenThread.h
 	Queue.h
 	Semaphore.h
-	Sleep.h
 	Socket.h
 	SocketThreads.h
 	Timer.h)
diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h
index 8dfad84cb..ba6a48898 100644
--- a/src/OSSupport/IsThread.h
+++ b/src/OSSupport/IsThread.h
@@ -33,7 +33,7 @@ protected:
 	volatile bool m_ShouldTerminate;
 	
 public:
-	cIsThread(const AString & iThreadName);
+	cIsThread(const AString & a_ThreadName);
 	virtual ~cIsThread();
 	
 	/// Starts the thread; returns without waiting for the actual start
diff --git a/src/OSSupport/Sleep.cpp b/src/OSSupport/Sleep.cpp
deleted file mode 100644
index 297d668d7..000000000
--- a/src/OSSupport/Sleep.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-
-#ifndef _WIN32
-	#include <unistd.h>
-#endif
-
-
-
-
-
-void cSleep::MilliSleep( unsigned int a_MilliSeconds)
-{
-#ifdef _WIN32
-	Sleep(a_MilliSeconds);  // Don't tick too much
-#else
-	usleep(a_MilliSeconds*1000);
-#endif
-}
diff --git a/src/OSSupport/Sleep.h b/src/OSSupport/Sleep.h
deleted file mode 100644
index 57d29682c..000000000
--- a/src/OSSupport/Sleep.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-class cSleep
-{
-public:
-	static void MilliSleep( unsigned int a_MilliSeconds);
-};
diff --git a/src/OSSupport/Timer.cpp b/src/OSSupport/Timer.cpp
deleted file mode 100644
index fd838dd0d..000000000
--- a/src/OSSupport/Timer.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-
-#include "Timer.h"
-
-
-
-
-
-
-cTimer::cTimer(void)
-{
-	#ifdef _WIN32
-		QueryPerformanceFrequency(&m_TicksPerSecond);
-	#endif
-}
-
-
-
-
-
-long long cTimer::GetNowTime(void)
-{
-	#ifdef _WIN32
-		LARGE_INTEGER now;
-		QueryPerformanceCounter(&now);
-		return ((now.QuadPart * 1000) / m_TicksPerSecond.QuadPart);
-	#else
-		struct timeval  now;
-		gettimeofday(&now, NULL);
-		return (long long)now.tv_sec * 1000 + (long long)now.tv_usec / 1000;
-	#endif
-}
-
-
-
-
diff --git a/src/OSSupport/Timer.h b/src/OSSupport/Timer.h
deleted file mode 100644
index a059daa41..000000000
--- a/src/OSSupport/Timer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// Timer.h
-
-// Declares the cTimer class representing an OS-independent of retrieving current time with msec accuracy
-
-
-
-
-
-#pragma once
-
-
-
-
-
-class cTimer
-{
-public:
-	cTimer(void);
-
-	// Returns the current time expressed in milliseconds
-	long long GetNowTime(void);
-private:
-
-	#ifdef _WIN32
-		LARGE_INTEGER m_TicksPerSecond;
-	#endif
-} ;
-
-
-
-
-- 
cgit v1.2.3


From a324333c11c7cc981104ae0483a0203c34e0e991 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 20 Oct 2014 21:26:18 +0100
Subject: Use std::recusive_mutex

---
 src/OSSupport/CriticalSection.cpp | 48 ++++-----------------------------------
 src/OSSupport/CriticalSection.h   | 11 +++------
 src/OSSupport/IsThread.cpp        |  2 +-
 3 files changed, 9 insertions(+), 52 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/CriticalSection.cpp b/src/OSSupport/CriticalSection.cpp
index 3e8e7498d..13a3e4d9f 100644
--- a/src/OSSupport/CriticalSection.cpp
+++ b/src/OSSupport/CriticalSection.cpp
@@ -1,6 +1,5 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "IsThread.h"
 
 
 
@@ -9,41 +8,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 // cCriticalSection:
 
+#ifdef _DEBUG
 cCriticalSection::cCriticalSection()
 {
-	#ifdef _WIN32
-		InitializeCriticalSection(&m_CriticalSection);
-	#else
-		pthread_mutexattr_init(&m_Attributes);
-		pthread_mutexattr_settype(&m_Attributes, PTHREAD_MUTEX_RECURSIVE);
-
-		if (pthread_mutex_init(&m_CriticalSection, &m_Attributes) != 0)
-		{
-			LOGERROR("Could not initialize Critical Section!");
-		}
-	#endif
-	
-	#ifdef _DEBUG
-		m_IsLocked = 0;
-	#endif  // _DEBUG
-}
-
-
-
-
-
-cCriticalSection::~cCriticalSection()
-{
-	#ifdef _WIN32
-		DeleteCriticalSection(&m_CriticalSection);
-	#else
-		if (pthread_mutex_destroy(&m_CriticalSection) != 0)
-		{
-			LOGWARNING("Could not destroy Critical Section!");
-		}
-		pthread_mutexattr_destroy(&m_Attributes);
-	#endif
+	m_IsLocked = 0;
 }
+#endif  // _DEBUG
 
 
 
@@ -51,11 +21,7 @@ cCriticalSection::~cCriticalSection()
 
 void cCriticalSection::Lock()
 {
-	#ifdef _WIN32
-		EnterCriticalSection(&m_CriticalSection);
-	#else
-		pthread_mutex_lock(&m_CriticalSection);
-	#endif
+	m_Mutex.lock();
 	
 	#ifdef _DEBUG
 		m_IsLocked += 1;
@@ -74,11 +40,7 @@ void cCriticalSection::Unlock()
 		m_IsLocked -= 1;
 	#endif  // _DEBUG
 	
-	#ifdef _WIN32
-		LeaveCriticalSection(&m_CriticalSection);
-	#else
-		pthread_mutex_unlock(&m_CriticalSection);
-	#endif
+	m_Mutex.unlock();
 }
 
 
diff --git a/src/OSSupport/CriticalSection.h b/src/OSSupport/CriticalSection.h
index 7822a5471..19e4f78af 100644
--- a/src/OSSupport/CriticalSection.h
+++ b/src/OSSupport/CriticalSection.h
@@ -1,5 +1,6 @@
 
 #pragma once
+#include <mutex>
 
 
 
@@ -8,8 +9,6 @@
 class cCriticalSection
 {
 public:
-	cCriticalSection(void);
-	~cCriticalSection();
 
 	void Lock(void);
 	void Unlock(void);
@@ -17,6 +16,7 @@ public:
 	// IsLocked/IsLockedByCurrentThread are only used in ASSERT statements, but because of the changes with ASSERT they must always be defined
 	// The fake versions (in Release) will not effect the program in any way
 	#ifdef _DEBUG
+	cCriticalSection(void);
 	bool IsLocked(void);
 	bool IsLockedByCurrentThread(void);
 	#else
@@ -30,12 +30,7 @@ private:
 	std::thread::id m_OwningThreadID;
 	#endif  // _DEBUG
 	
-	#ifdef _WIN32
-		CRITICAL_SECTION m_CriticalSection;
-	#else  // _WIN32
-		pthread_mutex_t     m_CriticalSection;
-		pthread_mutexattr_t m_Attributes;
-	#endif  // else _WIN32
+	std::recursive_mutex m_Mutex;
 } ALIGN_8;
 
 
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 4864ef28b..94c867d19 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -63,7 +63,7 @@ void cIsThread::Stop(void)
 
 
 bool cIsThread::Wait(void)
-{	
+{
 	#ifdef LOGD  // ProtoProxy doesn't have LOGD
 		LOGD("Waiting for thread %s to finish", m_ThreadName.c_str());
 	#endif  // LOGD
-- 
cgit v1.2.3


From 987f79afdd8945966d0dfa2d52539e005f771590 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 20 Oct 2014 21:55:07 +0100
Subject: En masse NULL -> nullptr replace

---
 src/OSSupport/Errors.cpp        |  4 ++--
 src/OSSupport/Event.cpp         |  6 +++---
 src/OSSupport/File.cpp          | 22 +++++++++++-----------
 src/OSSupport/GZipFile.cpp      | 14 +++++++-------
 src/OSSupport/ListenThread.cpp  |  2 +-
 src/OSSupport/Semaphore.cpp     |  4 ++--
 src/OSSupport/Socket.cpp        |  2 +-
 src/OSSupport/SocketThreads.cpp | 14 +++++++-------
 src/OSSupport/SocketThreads.h   |  2 +-
 9 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp
index 9401ec257..a5361e1a6 100644
--- a/src/OSSupport/Errors.cpp
+++ b/src/OSSupport/Errors.cpp
@@ -10,7 +10,7 @@ AString GetOSErrorString( int a_ErrNo)
 
 	#ifdef _WIN32
 
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, a_ErrNo, 0, buffer, ARRAYCOUNT(buffer), NULL);
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, a_ErrNo, 0, buffer, ARRAYCOUNT(buffer), nullptr);
 	Printf(Out, "%d: %s", a_ErrNo, buffer);
 	if (!Out.empty() && (Out[Out.length() - 1] == '\n'))
 	{
@@ -25,7 +25,7 @@ AString GetOSErrorString( int a_ErrNo)
 	#if !defined(__APPLE__) && ( _GNU_SOURCE) && !defined(ANDROID_NDK)  // GNU version of strerror_r()
 	
 	char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer));
-	if (res != NULL)
+	if (res != nullptr)
 	{
 		Printf(Out, "%d: %s", a_ErrNo, res);
 		return Out;
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 7cf8a826c..87bc110ce 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -15,8 +15,8 @@
 cEvent::cEvent(void)
 {
 #ifdef _WIN32
-	m_Event = CreateEvent(NULL, FALSE, FALSE, NULL);
-	if (m_Event == NULL)
+	m_Event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
+	if (m_Event == nullptr)
 	{
 		LOGERROR("cEvent: cannot create event, GLE = %u. Aborting server.", (unsigned)GetLastError());
 		abort();
@@ -71,7 +71,7 @@ cEvent::~cEvent()
 	{
 		sem_destroy(m_Event);
 		delete m_Event;
-		m_Event = NULL;
+		m_Event = nullptr;
 	}
 #endif
 }
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp
index cb6031da6..8957dfaef 100644
--- a/src/OSSupport/File.cpp
+++ b/src/OSSupport/File.cpp
@@ -17,7 +17,7 @@
 
 cFile::cFile(void) :
 	#ifdef USE_STDIO_FILE
-	m_File(NULL)
+	m_File(nullptr)
 	#else
 	m_File(INVALID_HANDLE_VALUE)
 	#endif  // USE_STDIO_FILE
@@ -31,7 +31,7 @@ cFile::cFile(void) :
 
 cFile::cFile(const AString & iFileName, eMode iMode) :
 	#ifdef USE_STDIO_FILE
-	m_File(NULL)
+	m_File(nullptr)
 	#else
 	m_File(INVALID_HANDLE_VALUE)
 	#endif  // USE_STDIO_FILE
@@ -64,7 +64,7 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
 		Close();
 	}
 	
-	const char * Mode = NULL;
+	const char * Mode = nullptr;
 	switch (iMode)
 	{
 		case fmRead:      Mode = "rb";  break;
@@ -72,7 +72,7 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
 		case fmReadWrite: Mode = "rb+"; break;
 		case fmAppend:    Mode = "a+";  break;
 	}
-	if (Mode == NULL)
+	if (Mode == nullptr)
 	{
 		ASSERT(!"Unhandled file mode");
 		return false;
@@ -84,7 +84,7 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
 	m_File = fopen((FILE_IO_PREFIX + iFileName).c_str(), Mode);
 #endif  // _WIN32
 
-	if ((m_File == NULL) && (iMode == fmReadWrite))
+	if ((m_File == nullptr) && (iMode == fmReadWrite))
 	{
 		// Fix for MS not following C spec, opening "a" mode files for writing at the end only
 		// The file open operation has been tried with "read update", fails if file not found
@@ -98,7 +98,7 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
 #endif  // _WIN32
 
 	}
-	return (m_File != NULL);
+	return (m_File != nullptr);
 }
 
 
@@ -114,7 +114,7 @@ void cFile::Close(void)
 	}
 
 	fclose(m_File);
-	m_File = NULL;
+	m_File = nullptr;
 }
 
 
@@ -123,7 +123,7 @@ void cFile::Close(void)
 
 bool cFile::IsOpen(void) const
 {
-	return (m_File != NULL);
+	return (m_File != nullptr);
 }
 
 
@@ -366,7 +366,7 @@ int cFile::GetSize(const AString & a_FileName)
 bool cFile::CreateFolder(const AString & a_FolderPath)
 {
 	#ifdef _WIN32
-		return (CreateDirectoryA(a_FolderPath.c_str(), NULL) != 0);
+		return (CreateDirectoryA(a_FolderPath.c_str(), nullptr) != 0);
 	#else
 		return (mkdir(a_FolderPath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO) == 0);
 	#endif
@@ -415,13 +415,13 @@ AStringVector cFile::GetFolderContents(const AString & a_Folder)
 	{
 		Folder = ".";
 	}
-	if ((dp = opendir(Folder.c_str())) == NULL)
+	if ((dp = opendir(Folder.c_str())) == nullptr)
 	{
 		LOGERROR("Error (%i) opening directory \"%s\"\n", errno, Folder.c_str());
 	}
 	else
 	{
-		while ((dirp = readdir(dp)) != NULL)
+		while ((dirp = readdir(dp)) != nullptr)
 		{
 			AllFiles.push_back(dirp->d_name);
 		}
diff --git a/src/OSSupport/GZipFile.cpp b/src/OSSupport/GZipFile.cpp
index 22d887783..32d84a0d5 100644
--- a/src/OSSupport/GZipFile.cpp
+++ b/src/OSSupport/GZipFile.cpp
@@ -11,7 +11,7 @@
 
 
 cGZipFile::cGZipFile(void) :
-	m_File(NULL), m_Mode(fmRead)
+	m_File(nullptr), m_Mode(fmRead)
 {
 }
 
@@ -30,14 +30,14 @@ cGZipFile::~cGZipFile()
 
 bool cGZipFile::Open(const AString & a_FileName, eMode a_Mode)
 {
-	if (m_File != NULL)
+	if (m_File != nullptr)
 	{
 		ASSERT(!"A file is already open in this object");
 		return false;
 	}
 	m_File = gzopen(a_FileName.c_str(), (a_Mode == fmRead) ? "r" : "w");
 	m_Mode = a_Mode;
-	return (m_File != NULL);
+	return (m_File != nullptr);
 }
 
 
@@ -46,10 +46,10 @@ bool cGZipFile::Open(const AString & a_FileName, eMode a_Mode)
 
 void cGZipFile::Close(void)
 {
-	if (m_File != NULL)
+	if (m_File != nullptr)
 	{
 		gzclose(m_File);
-		m_File = NULL;
+		m_File = nullptr;
 	}
 }
 
@@ -59,7 +59,7 @@ void cGZipFile::Close(void)
 
 int cGZipFile::ReadRestOfFile(AString & a_Contents)
 {
-	if (m_File == NULL)
+	if (m_File == nullptr)
 	{
 		ASSERT(!"No file has been opened");
 		return -1;
@@ -90,7 +90,7 @@ int cGZipFile::ReadRestOfFile(AString & a_Contents)
 
 bool cGZipFile::Write(const char * a_Contents, int a_Size)
 {
-	if (m_File == NULL)
+	if (m_File == nullptr)
 	{
 		ASSERT(!"No file has been opened");
 		return false;
diff --git a/src/OSSupport/ListenThread.cpp b/src/OSSupport/ListenThread.cpp
index 02e98acfc..b029634e9 100644
--- a/src/OSSupport/ListenThread.cpp
+++ b/src/OSSupport/ListenThread.cpp
@@ -214,7 +214,7 @@ void cListenThread::Execute(void)
 		timeval tv;  // On Linux select() doesn't seem to wake up when socket is closed, so let's kinda busy-wait:
 		tv.tv_sec = 1;
 		tv.tv_usec = 0;
-		if (select((int)Highest + 1, &fdRead, NULL, NULL, &tv) == -1)
+		if (select((int)Highest + 1, &fdRead, nullptr, nullptr, &tv) == -1)
 		{
 			LOG("select(R) call failed in cListenThread: \"%s\"", cSocket::GetLastErrorString().c_str());
 			continue;
diff --git a/src/OSSupport/Semaphore.cpp b/src/OSSupport/Semaphore.cpp
index c1fc7d9c7..6a2d57901 100644
--- a/src/OSSupport/Semaphore.cpp
+++ b/src/OSSupport/Semaphore.cpp
@@ -36,7 +36,7 @@ cSemaphore::cSemaphore( unsigned int a_MaxCount, unsigned int a_InitialCount /*
 	}
 #else
 	m_Handle = CreateSemaphore(
-		NULL,  // security attribute
+		nullptr,  // security attribute
 		a_InitialCount,  // initial count
 		a_MaxCount,  // maximum count
 		0  // name (optional)
@@ -98,7 +98,7 @@ void cSemaphore::Signal()
 		LOG("ERROR: Could not signal cSemaphore. (%i)", errno);
 	}
 #else
-	ReleaseSemaphore( m_Handle, 1, NULL);
+	ReleaseSemaphore( m_Handle, 1, nullptr);
 #endif
 }
 
diff --git a/src/OSSupport/Socket.cpp b/src/OSSupport/Socket.cpp
index c07d31c8b..5025a09ad 100644
--- a/src/OSSupport/Socket.cpp
+++ b/src/OSSupport/Socket.cpp
@@ -292,7 +292,7 @@ bool cSocket::ConnectIPv4(const AString & a_HostNameOrAddr, unsigned short a_Por
 	{
 		// It is not an IP Address string, but rather a regular hostname, resolve:
 		hostent * hp = gethostbyname(a_HostNameOrAddr.c_str());
-		if (hp == NULL)
+		if (hp == nullptr)
 		{
 			LOGWARNING("%s: Could not resolve hostname \"%s\"", __FUNCTION__, a_HostNameOrAddr.c_str());
 			CloseSocket();
diff --git a/src/OSSupport/SocketThreads.cpp b/src/OSSupport/SocketThreads.cpp
index f436318a5..7a3ef4274 100644
--- a/src/OSSupport/SocketThreads.cpp
+++ b/src/OSSupport/SocketThreads.cpp
@@ -61,7 +61,7 @@ bool cSocketThreads::AddClient(const cSocket & a_Socket, cCallback * a_Client)
 		// There was an error launching the thread (but it was already logged along with the reason)
 		LOGERROR("A new cSocketThread failed to start");
 		delete Thread;
-		Thread = NULL;
+		Thread = nullptr;
 		return false;
 	}
 	Thread->AddClient(a_Socket, a_Client);
@@ -233,7 +233,7 @@ bool cSocketThreads::cSocketThread::RemoveClient(const cCallback * a_Client)
 				// More data to send, shut down reading and wait for the rest to get sent:
 				m_Slots[i].m_State = sSlot::ssWritingRestOut;
 			}
-			m_Slots[i].m_Client = NULL;
+			m_Slots[i].m_Client = nullptr;
 		}
 		
 		// Notify the thread of the change:
@@ -407,7 +407,7 @@ void cSocketThreads::cSocketThread::Execute(void)
 		timeval Timeout;
 		Timeout.tv_sec = 5;
 		Timeout.tv_usec = 0;
-		if (select((int)Highest + 1, &fdRead, &fdWrite, NULL, &Timeout) == -1)
+		if (select((int)Highest + 1, &fdRead, &fdWrite, nullptr, &Timeout) == -1)
 		{
 			LOG("select() call failed in cSocketThread: \"%s\"", cSocket::GetLastErrorString().c_str());
 			continue;
@@ -519,7 +519,7 @@ void cSocketThreads::cSocketThread::ReadFromSockets(fd_set * a_Read)
 		}
 		else
 		{
-			if (m_Slots[i].m_Client != NULL)
+			if (m_Slots[i].m_Client != nullptr)
 			{
 				m_Slots[i].m_Client->DataReceived(Buffer, Received);
 			}
@@ -545,7 +545,7 @@ void cSocketThreads::cSocketThread::WriteToSockets(fd_set * a_Write)
 		if (m_Slots[i].m_Outgoing.empty())
 		{
 			// Request another chunk of outgoing data:
-			if (m_Slots[i].m_Client != NULL)
+			if (m_Slots[i].m_Client != nullptr)
 			{
 				AString Data;
 				m_Slots[i].m_Client->GetOutgoingData(Data);
@@ -573,7 +573,7 @@ void cSocketThreads::cSocketThread::WriteToSockets(fd_set * a_Write)
 			int Err = cSocket::GetLastError();
 			LOGWARNING("Error %d while writing to client \"%s\", disconnecting. \"%s\"", Err, m_Slots[i].m_Socket.GetIPString().c_str(), GetOSErrorString(Err).c_str());
 			m_Slots[i].m_Socket.CloseSocket();
-			if (m_Slots[i].m_Client != NULL)
+			if (m_Slots[i].m_Client != nullptr)
 			{
 				m_Slots[i].m_Client->SocketClosed();
 			}
@@ -668,7 +668,7 @@ void cSocketThreads::cSocketThread::QueueOutgoingData(void)
 	cCSLock Lock(m_Parent->m_CS);
 	for (int i = 0; i < m_NumSlots; i++)
 	{
-		if (m_Slots[i].m_Client != NULL)
+		if (m_Slots[i].m_Client != nullptr)
 		{
 			AString Data;
 			m_Slots[i].m_Client->GetOutgoingData(Data);
diff --git a/src/OSSupport/SocketThreads.h b/src/OSSupport/SocketThreads.h
index 944f5f3bc..df819468d 100644
--- a/src/OSSupport/SocketThreads.h
+++ b/src/OSSupport/SocketThreads.h
@@ -137,7 +137,7 @@ private:
 			/** The socket is primarily owned by this object */
 			cSocket m_Socket;
 			
-			/** The callback to call for events. May be NULL */
+			/** The callback to call for events. May be nullptr */
 			cCallback * m_Client;
 			
 			/** If sending writes only partial data, the rest is stored here for another send.
-- 
cgit v1.2.3


From 2b920f9e2154f48e3838a073d79713716bce748d Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 21 Oct 2014 13:49:53 +0100
Subject: Compile fix?

---
 src/OSSupport/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index 45df0c1a3..29cf440ca 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -15,7 +15,7 @@ SET (SRCS
 	Semaphore.cpp
 	Socket.cpp
 	SocketThreads.cpp
-	Timer.cpp)
+)
 
 SET (HDRS
 	CriticalSection.h
@@ -29,7 +29,7 @@ SET (HDRS
 	Semaphore.h
 	Socket.h
 	SocketThreads.h
-	Timer.h)
+)
 
 if(NOT MSVC)
 	add_library(OSSupport ${SRCS} ${HDRS})
-- 
cgit v1.2.3


From 82472d09acacba9fcf31765e4abbfddd3ffbbcd1 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 23 Oct 2014 11:20:25 +0200
Subject: Reimplemented cEvent using C++11 primitives.

Fixes #1523.
---
 src/OSSupport/Event.cpp | 154 +++++++++++-------------------------------------
 src/OSSupport/Event.h   |  33 ++++++-----
 2 files changed, 51 insertions(+), 136 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 87bc110ce..e05de8e15 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -12,90 +12,23 @@
 
 
 
-cEvent::cEvent(void)
+cEvent::cEvent(void) :
+	m_ShouldWait(true)
 {
-#ifdef _WIN32
-	m_Event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
-	if (m_Event == nullptr)
-	{
-		LOGERROR("cEvent: cannot create event, GLE = %u. Aborting server.", (unsigned)GetLastError());
-		abort();
-	}
-#else  // *nix
-	m_bIsNamed = false;
-	m_Event = new sem_t;
-	if (sem_init(m_Event, 0, 0))
-	{
-		// This path is used by MacOS, because it doesn't support unnamed semaphores.
-		delete m_Event;
-		m_bIsNamed = true;
-
-		AString EventName;
-		Printf(EventName, "cEvent%p", this);
-		m_Event = sem_open(EventName.c_str(), O_CREAT, 777, 0);
-		if (m_Event == SEM_FAILED)
-		{
-			AString error = GetOSErrorString(errno);
-			LOGERROR("cEvent: Cannot create event, err = %s. Aborting server.", error.c_str());
-			abort();
-		}
-		// Unlink the semaphore immediately - it will continue to function but will not pollute the namespace
-		// We don't store the name, so can't call this in the destructor
-		if (sem_unlink(EventName.c_str()) != 0)
-		{
-			AString error = GetOSErrorString(errno);
-			LOGWARN("ERROR: Could not unlink cEvent. (%s)", error.c_str());
-		}
-	}
-#endif  // *nix
 }
 
 
 
 
 
-cEvent::~cEvent()
+void cEvent::Wait(void)
 {
-#ifdef _WIN32
-	CloseHandle(m_Event);
-#else
-	if (m_bIsNamed)
-	{
-		if (sem_close(m_Event) != 0)
-		{
-			AString error = GetOSErrorString(errno);
-			LOGERROR("ERROR: Could not close cEvent. (%s)", error.c_str());
-		}
-	}
-	else
+	std::unique_lock<std::mutex> Lock(m_Mutex);
+	while (m_ShouldWait)
 	{
-		sem_destroy(m_Event);
-		delete m_Event;
-		m_Event = nullptr;
+		m_CondVar.wait(Lock);
 	}
-#endif
-}
-
-
-
-
-
-void cEvent::Wait(void)
-{
-	#ifdef _WIN32
-		DWORD res = WaitForSingleObject(m_Event, INFINITE);
-		if (res != WAIT_OBJECT_0)
-		{
-			LOGWARN("cEvent: waiting for the event failed: %u, GLE = %u. Continuing, but server may be unstable.", (unsigned)res, (unsigned)GetLastError());
-		}
-	#else
-		int res = sem_wait(m_Event);
-		if (res != 0)
-		{
-			AString error = GetOSErrorString(errno);
-			LOGWARN("cEvent: waiting for the event failed: %i, err = %s. Continuing, but server may be unstable.", res, error.c_str());
-		}
-	#endif
+	m_ShouldWait = true;
 }
 
 
@@ -104,45 +37,34 @@ void cEvent::Wait(void)
 
 bool cEvent::Wait(int a_TimeoutMSec)
 {
-	#ifdef _WIN32
-		DWORD res = WaitForSingleObject(m_Event, (DWORD)a_TimeoutMSec);
-		switch (res)
+	std::chrono::steady_clock::time_point dst = std::chrono::steady_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
+	std::unique_lock<std::mutex> Lock(m_Mutex);  // We assume that this lock is acquired without much delay - we are the only user of the mutex
+	while (m_ShouldWait && (std::chrono::steady_clock::now() < dst))
+	{
+		switch (m_CondVar.wait_until(Lock, dst))
 		{
-			case WAIT_OBJECT_0: return true;   // Regular event signalled
-			case WAIT_TIMEOUT:  return false;  // Regular event timeout
-			default:
+			case std::cv_status::no_timeout:
 			{
-				LOGWARN("cEvent: waiting for the event failed: %u, GLE = %u. Continuing, but server may be unstable.", (unsigned)res, (unsigned)GetLastError());
-				return false;
+				// The wait was successful, check for spurious wakeup:
+				if (!m_ShouldWait)
+				{
+					m_ShouldWait = true;
+					return true;
+				}
+				// This was a spurious wakeup, wait again:
+				continue;
 			}
-		}
-	#else
-		// Get the current time:
-		timespec timeout;
-		if (clock_gettime(CLOCK_REALTIME, &timeout) == -1)
-		{
-			LOGWARN("cEvent: Getting current time failed: %i, err = %s. Continuing, but the server may be unstable.", errno, GetOSErrorString(errno).c_str());
-			return false;
-		}
-
-		// Add the specified timeout:
-		timeout.tv_sec += a_TimeoutMSec / 1000;
-		timeout.tv_nsec += (a_TimeoutMSec % 1000) * 1000000;  // 1 msec = 1000000 usec
-
-		// Wait with timeout:
-		int res = sem_timedwait(m_Event, &timeout);
-		switch (res)
-		{
-			case 0:         return true;   // Regular event signalled
-			case ETIMEDOUT: return false;  // Regular even timeout
-			default:
+			
+			case std::cv_status::timeout:
 			{
-				AString error = GetOSErrorString(errno);
-				LOGWARN("cEvent: waiting for the event failed: %i, err = %s. Continuing, but server may be unstable.", res, error.c_str());
+				// The wait timed out, return failure:
 				return false;
 			}
-		}
-	#endif
+		}  // switch (wait_until())
+	}  // while (m_ShouldWait && not timeout)
+
+	// The wait timed out in the while() condition:
+	return false;
 }
 
 
@@ -151,19 +73,11 @@ bool cEvent::Wait(int a_TimeoutMSec)
 
 void cEvent::Set(void)
 {
-	#ifdef _WIN32
-		if (!SetEvent(m_Event))
-		{
-			LOGWARN("cEvent: Could not set cEvent: GLE = %u", (unsigned)GetLastError());
-		}
-	#else
-		int res = sem_post(m_Event);
-		if (res != 0)
-		{
-			AString error = GetOSErrorString(errno);
-			LOGWARN("cEvent: Could not set cEvent: %i, err = %s", res, error.c_str());
-		}
-	#endif
+	{
+		std::unique_lock<std::mutex> Lock(m_Mutex);
+		m_ShouldWait = false;
+	}
+	m_CondVar.notify_one();
 }
 
 
diff --git a/src/OSSupport/Event.h b/src/OSSupport/Event.h
index e2fa65a05..5818115be 100644
--- a/src/OSSupport/Event.h
+++ b/src/OSSupport/Event.h
@@ -1,16 +1,17 @@
 
 // Event.h
 
-// Interfaces to the cEvent object representing an OS-specific synchronization primitive that can be waited-for
-// Implemented as an Event on Win and as a 1-semaphore on *nix
+// Interfaces to the cEvent object representing a synchronization primitive that can be waited-for
+// Implemented using C++11 condition variable and mutex
 
 
 
 
 
 #pragma once
-#ifndef CEVENT_H_INCLUDED
-#define CEVENT_H_INCLUDED
+
+#include <mutex>
+#include <condition_variable>
 
 
 
@@ -20,9 +21,13 @@ class cEvent
 {
 public:
 	cEvent(void);
-	~cEvent();
 
+	/** Waits until the event has been set.
+	If the event has been set before it has been waited for, Wait() returns immediately. */
 	void Wait(void);
+
+	/** Sets the event - releases one thread that has been waiting in Wait().
+	If there was no thread waiting, the next call to Wait() will not block. */
 	void Set (void);
 
 	/** Waits for the event until either it is signalled, or the (relative) timeout is passed.
@@ -31,20 +36,16 @@ public:
 	
 private:
 
-	#ifdef _WIN32
-	HANDLE m_Event;
-	#else
-	sem_t * m_Event;
-	bool    m_bIsNamed;
-	#endif
-} ;
-
-
-
+	/** Used for checking for spurious wakeups. */
+	bool m_ShouldWait;
 
+	/** Mutex protecting m_ShouldWait from multithreaded access. */
+	std::mutex m_Mutex;
 
+	/** The condition variable used as the Event. */
+	std::condition_variable m_CondVar;
+} ;
 
-#endif  // CEVENT_H_INCLUDED
 
 
 
-- 
cgit v1.2.3


From 51fa6b4090ee930d03592550613592b1087fb788 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu, 23 Oct 2014 23:58:01 +0100
Subject: Suggestions

---
 src/OSSupport/CriticalSection.h |  1 +
 src/OSSupport/IsThread.cpp      | 46 +++++++++++++++++++++++++++++++++++++++--
 src/OSSupport/IsThread.h        |  5 +----
 3 files changed, 46 insertions(+), 6 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/CriticalSection.h b/src/OSSupport/CriticalSection.h
index 19e4f78af..17fcdfc12 100644
--- a/src/OSSupport/CriticalSection.h
+++ b/src/OSSupport/CriticalSection.h
@@ -1,6 +1,7 @@
 
 #pragma once
 #include <mutex>
+#include <thread>
 
 
 
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 94c867d19..02d8a77c7 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -11,6 +11,40 @@
 
 
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+	// Code adapted from MSDN: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
+
+	const DWORD MS_VC_EXCEPTION = 0x406D1388;
+	#pragma pack(push, 8)
+		struct THREADNAME_INFO
+		{
+			DWORD  dwType;      // Must be 0x1000. 
+			LPCSTR szName;      // Pointer to name (in user addr space). 
+			DWORD  dwThreadID;  // Thread ID (-1 = caller thread). 
+			DWORD  dwFlags;     // Reserved for future use, must be zero. 
+		};
+	#pragma pack(pop)
+
+	/** Sets the name of a thread with the specified ID
+	(When in MSVC, the debugger provides "thread naming" by catching special exceptions)
+	*/
+	static void SetThreadName(std::thread * a_Thread, const char * a_ThreadName)
+	{
+		THREADNAME_INFO info { 0x1000, a_ThreadName, GetThreadId(a_Thread->native_handle()), 0 };
+		__try
+		{
+			RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info);
+		}
+		__except (EXCEPTION_EXECUTE_HANDLER)
+		{
+		}
+	}
+#endif  // _MSC_VER && _DEBUG 
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // cIsThread:
 
@@ -39,11 +73,19 @@ bool cIsThread::Start(void)
 	try
 	{
 		m_Thread = std::thread(&cIsThread::Execute, this);
+
+		#if defined (_MSC_VER) && defined(_DEBUG)
+		if (!m_ThreadName.empty())
+		{
+			SetThreadName(&m_Thread, m_ThreadName.c_str());
+		}
+		#endif
+
 		return true;
 	}
 	catch (std::system_error & a_Exception)
 	{
-		LOGERROR("ERROR: Could not create thread \"%s\", error = %s!", m_ThreadName.c_str(), a_Exception.code(), a_Exception.what());
+		LOGERROR("cIsThread::Wait (std::thread) error %i: could not construct thread %s; %s", m_ThreadName.c_str(), a_Exception.code().value(), a_Exception.what());
 		return false;
 	}
 }
@@ -77,7 +119,7 @@ bool cIsThread::Wait(void)
 		}
 		catch (std::system_error & a_Exception)
 		{
-			LOGERROR("ERROR: Could wait for thread \"%s\" to finish, error = %s!", m_ThreadName.c_str(), a_Exception.code(), a_Exception.what());
+			LOGERROR("cIsThread::Wait (std::thread) error %i: could not join thread %s; %s", m_ThreadName.c_str(), a_Exception.code().value(), a_Exception.what());
 			return false;
 		}
 	}
diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h
index 6aadaf447..131c6950e 100644
--- a/src/OSSupport/IsThread.h
+++ b/src/OSSupport/IsThread.h
@@ -16,8 +16,7 @@ In the descending class' constructor call the Start() method to start the thread
 
 
 #pragma once
-#ifndef CISTHREAD_H_INCLUDED
-#define CISTHREAD_H_INCLUDED
+#include <thread>
 
 
 
@@ -56,5 +55,3 @@ protected:
 
 
 
-
-#endif  // CISTHREAD_H_INCLUDED
-- 
cgit v1.2.3


From 4b32c00f667eb37fbf325110e68fbfe62b089b98 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 24 Oct 2014 10:22:17 +0200
Subject: Added a missing chrono include.

---
 src/OSSupport/Event.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index e05de8e15..fbf04b47c 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -7,6 +7,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Event.h"
+#include <chrono>
 #include "Errors.h"
 
 
-- 
cgit v1.2.3


From b9777287ca79fbf9abae57e0ab36acf561995f10 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 24 Oct 2014 11:01:45 +0200
Subject: Moved the chrono include into Globals.

---
 src/OSSupport/Event.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index fbf04b47c..e05de8e15 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -7,7 +7,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Event.h"
-#include <chrono>
 #include "Errors.h"
 
 
-- 
cgit v1.2.3


From 0d15261601317efa062d2573ec8d074a89ad4846 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 4 Nov 2014 15:47:55 +0100
Subject: cEvent: Changed steady_clock to system_clock.

---
 src/OSSupport/Event.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index e05de8e15..7007b5dd2 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -37,9 +37,9 @@ void cEvent::Wait(void)
 
 bool cEvent::Wait(int a_TimeoutMSec)
 {
-	std::chrono::steady_clock::time_point dst = std::chrono::steady_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
+	std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
 	std::unique_lock<std::mutex> Lock(m_Mutex);  // We assume that this lock is acquired without much delay - we are the only user of the mutex
-	while (m_ShouldWait && (std::chrono::steady_clock::now() < dst))
+	while (m_ShouldWait && (std::chrono::system_clock::now() < dst))
 	{
 		switch (m_CondVar.wait_until(Lock, dst))
 		{
-- 
cgit v1.2.3


From 5dbf6018249101a7ef459dffdb2abfbc4984a442 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 4 Nov 2014 15:56:27 +0100
Subject: cEvent: Changed chrono duration resolution.

---
 src/OSSupport/Event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 7007b5dd2..d519ad63f 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -37,7 +37,7 @@ void cEvent::Wait(void)
 
 bool cEvent::Wait(int a_TimeoutMSec)
 {
-	std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
+	std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::microseconds(a_TimeoutMSec * 1000);
 	std::unique_lock<std::mutex> Lock(m_Mutex);  // We assume that this lock is acquired without much delay - we are the only user of the mutex
 	while (m_ShouldWait && (std::chrono::system_clock::now() < dst))
 	{
-- 
cgit v1.2.3


From 6382989ba08727898587f34f505a03a9035511a2 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 23 Nov 2014 14:22:05 +0000
Subject: Compilation fixes

---
 src/OSSupport/IsThread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 02d8a77c7..8914cac90 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -85,7 +85,7 @@ bool cIsThread::Start(void)
 	}
 	catch (std::system_error & a_Exception)
 	{
-		LOGERROR("cIsThread::Wait (std::thread) error %i: could not construct thread %s; %s", m_ThreadName.c_str(), a_Exception.code().value(), a_Exception.what());
+		LOGERROR("cIsThread::Wait (std::thread) error %i: could not construct thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.what());
 		return false;
 	}
 }
@@ -119,7 +119,7 @@ bool cIsThread::Wait(void)
 		}
 		catch (std::system_error & a_Exception)
 		{
-			LOGERROR("cIsThread::Wait (std::thread) error %i: could not join thread %s; %s", m_ThreadName.c_str(), a_Exception.code().value(), a_Exception.what());
+			LOGERROR("cIsThread::Wait (std::thread) error %i: could not join thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.what());
 			return false;
 		}
 	}
-- 
cgit v1.2.3


From 010546051e60856cfaeebbf60e1fc641d467c566 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 3 Dec 2014 16:14:26 +0100
Subject: Fixes socket leak in HTTP server.

Fixes #1643.
---
 src/OSSupport/SocketThreads.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/SocketThreads.cpp b/src/OSSupport/SocketThreads.cpp
index 7a3ef4274..153d6ed1d 100644
--- a/src/OSSupport/SocketThreads.cpp
+++ b/src/OSSupport/SocketThreads.cpp
@@ -86,7 +86,8 @@ void cSocketThreads::RemoveClient(const cCallback * a_Client)
 		}
 	}  // for itr - m_Threads[]
 
-	ASSERT(!"Removing an unknown client");
+	// This client wasn't found.
+	// It's not an error, because it may have been removed by a different thread in the meantime.
 }
 
 
@@ -491,10 +492,17 @@ void cSocketThreads::cSocketThread::ReadFromSockets(fd_set * a_Read)
 				{
 					case sSlot::ssNormal:
 					{
-						// Notify the callback that the remote has closed the socket; keep the slot
-						m_Slots[i].m_Client->SocketClosed();
+						// Close the socket on our side:
 						m_Slots[i].m_State = sSlot::ssRemoteClosed;
 						m_Slots[i].m_Socket.CloseSocket();
+
+						// Notify the callback that the remote has closed the socket, *after* removing the socket:
+						cCallback * client = m_Slots[i].m_Client;
+						m_Slots[i] = m_Slots[--m_NumSlots];
+						if (client != nullptr)
+						{
+							client->SocketClosed();
+						}
 						break;
 					}
 					case sSlot::ssWritingRestOut:
-- 
cgit v1.2.3


From 64f8428d037e56986bb18e064a4b49de96c480ff Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 4 Dec 2014 22:07:04 +0100
Subject: Fixed trailing whitespace.

---
 src/OSSupport/IsThread.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 8914cac90..9c62c89bf 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -18,10 +18,10 @@
 	#pragma pack(push, 8)
 		struct THREADNAME_INFO
 		{
-			DWORD  dwType;      // Must be 0x1000. 
-			LPCSTR szName;      // Pointer to name (in user addr space). 
-			DWORD  dwThreadID;  // Thread ID (-1 = caller thread). 
-			DWORD  dwFlags;     // Reserved for future use, must be zero. 
+			DWORD  dwType;      // Must be 0x1000.
+			LPCSTR szName;      // Pointer to name (in user addr space).
+			DWORD  dwThreadID;  // Thread ID (-1 = caller thread).
+			DWORD  dwFlags;     // Reserved for future use, must be zero.
 		};
 	#pragma pack(pop)
 
@@ -39,7 +39,7 @@
 		{
 		}
 	}
-#endif  // _MSC_VER && _DEBUG 
+#endif  // _MSC_VER && _DEBUG
 
 
 
-- 
cgit v1.2.3


From 44644ae0254bf3659c0995575041e2f656f20398 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 5 Dec 2014 12:56:53 +0100
Subject: Fixed reported parentheses around comparisons.

---
 src/OSSupport/Socket.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Socket.h b/src/OSSupport/Socket.h
index e4ec895cb..9ec8c1111 100644
--- a/src/OSSupport/Socket.h
+++ b/src/OSSupport/Socket.h
@@ -74,7 +74,7 @@ public:
 	inline static bool IsSocketError(int a_ReturnedValue)
 	{
 		#ifdef _WIN32
-			return (a_ReturnedValue == SOCKET_ERROR || a_ReturnedValue == 0);
+			return ((a_ReturnedValue == SOCKET_ERROR) || (a_ReturnedValue == 0));
 		#else
 			return (a_ReturnedValue <= 0);
 		#endif
-- 
cgit v1.2.3


From e2a04f580a0813206f527a61244cb3382248fd12 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 5 Dec 2014 16:59:11 +0100
Subject: BasicStyle: Added missing braces to control statements.

---
 src/OSSupport/Thread.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Thread.cpp b/src/OSSupport/Thread.cpp
index faaccce96..6188d5088 100644
--- a/src/OSSupport/Thread.cpp
+++ b/src/OSSupport/Thread.cpp
@@ -83,12 +83,16 @@ cThread::~cThread()
 void cThread::Start( bool a_bWaitOnDelete /* = true */)
 {
 	if (a_bWaitOnDelete)
+	{
 		m_StopEvent = new cEvent();
+	}
 
 #ifndef _WIN32
 	pthread_t SndThread;
 	if (pthread_create( &SndThread, NULL, MyThread, this))
+	{
 		LOGERROR("ERROR: Could not create thread!");
+	}
 #else
 	DWORD ThreadID = 0;
 	HANDLE hThread = CreateThread(NULL  // security
@@ -132,6 +136,11 @@ void *cThread::MyThread( void *a_Param)
 
 	ThreadFunction( ThreadParam);
 
-	if (StopEvent) StopEvent->Set();
+	// If the thread was marked as wait-on-delete, signal the event being waited on:
+	if (StopEvent != nullptr)
+	{
+		StopEvent->Set();
+	}
+
 	return 0;
 }
-- 
cgit v1.2.3


From 3c3cb198f33fd55b9cb20188cc42034b21660d21 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 7 Dec 2014 15:46:27 +0100
Subject: Fixed c++11 branch issues.

---
 src/OSSupport/IsThread.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 9c62c89bf..94bed1f56 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -85,7 +85,7 @@ bool cIsThread::Start(void)
 	}
 	catch (std::system_error & a_Exception)
 	{
-		LOGERROR("cIsThread::Wait (std::thread) error %i: could not construct thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.what());
+		LOGERROR("cIsThread::Start error %i: could not construct thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.code().message().c_str());
 		return false;
 	}
 }
@@ -96,6 +96,12 @@ bool cIsThread::Start(void)
 
 void cIsThread::Stop(void)
 {
+	if (!m_Thread.joinable())
+	{
+		// The thread hasn't been started or has already been joined
+		return;
+	}
+
 	m_ShouldTerminate = true;
 	Wait();
 }
@@ -106,10 +112,7 @@ void cIsThread::Stop(void)
 
 bool cIsThread::Wait(void)
 {
-	#ifdef LOGD  // ProtoProxy doesn't have LOGD
-		LOGD("Waiting for thread %s to finish", m_ThreadName.c_str());
-	#endif  // LOGD
-
+	LOGD("Waiting for thread %s to finish", m_ThreadName.c_str());
 	if (m_Thread.joinable())
 	{
 		try
@@ -119,15 +122,12 @@ bool cIsThread::Wait(void)
 		}
 		catch (std::system_error & a_Exception)
 		{
-			LOGERROR("cIsThread::Wait (std::thread) error %i: could not join thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.what());
+			LOGERROR("cIsThread::Wait error %i: could not join thread %s; %s", a_Exception.code().value(), m_ThreadName.c_str(), a_Exception.code().message().c_str());
 			return false;
 		}
 	}
 
-	#ifdef LOGD  // ProtoProxy doesn't have LOGD
-		LOGD("Thread %s finished", m_ThreadName.c_str());
-	#endif
-
+	LOGD("Thread %s finished", m_ThreadName.c_str());
 	return true;
 }
 
-- 
cgit v1.2.3


From c65bb6341dfc25ae937bd12c9e41855fb27fdccb Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 7 Dec 2014 21:37:47 +0100
Subject: Fixed integer overflow problems.

The event would overflow when requesting a 60 minute timeout.
---
 src/OSSupport/Event.cpp | 6 +++---
 src/OSSupport/Event.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index d519ad63f..d6ba937f9 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -35,11 +35,11 @@ void cEvent::Wait(void)
 
 
 
-bool cEvent::Wait(int a_TimeoutMSec)
+bool cEvent::Wait(unsigned a_TimeoutMSec)
 {
-	std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::microseconds(a_TimeoutMSec * 1000);
+	auto dst = std::chrono::system_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
 	std::unique_lock<std::mutex> Lock(m_Mutex);  // We assume that this lock is acquired without much delay - we are the only user of the mutex
-	while (m_ShouldWait && (std::chrono::system_clock::now() < dst))
+	while (m_ShouldWait && (std::chrono::system_clock::now() <= dst))
 	{
 		switch (m_CondVar.wait_until(Lock, dst))
 		{
diff --git a/src/OSSupport/Event.h b/src/OSSupport/Event.h
index 5818115be..572388a3f 100644
--- a/src/OSSupport/Event.h
+++ b/src/OSSupport/Event.h
@@ -32,7 +32,7 @@ public:
 
 	/** Waits for the event until either it is signalled, or the (relative) timeout is passed.
 	Returns true if the event was signalled, false if the timeout was hit or there was an error. */
-	bool Wait(int a_TimeoutMSec);
+	bool Wait(unsigned a_TimeoutMSec);
 	
 private:
 
-- 
cgit v1.2.3


From 2ab8d2bd98004e40a915e1c9eca764d32115d6c5 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 9 Dec 2014 10:43:40 +0100
Subject: Added a RemoveIf() function to cQueue

---
 src/OSSupport/Queue.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h
index 8d096fe29..82f221453 100644
--- a/src/OSSupport/Queue.h
+++ b/src/OSSupport/Queue.h
@@ -163,6 +163,29 @@ public:
 		return false;
 	}
 
+
+	/** Removes all items for which the predicate returns true. */
+	template <class Predicate>
+	void RemoveIf(Predicate a_Predicate)
+	{
+		cCSLock Lock(m_CS);
+		for (auto itr = m_Contents.begin(); itr != m_Contents.end();)
+		{
+			if (a_Predicate(*itr))
+			{
+				auto itr2 = itr;
+				++itr2;
+				m_Contents.erase(itr);
+				m_evtRemoved.Set();
+				itr = itr2;
+			}
+			else
+			{
+				++itr;
+			}
+		}  // for itr - m_Contents[]
+	}
+
 private:
 	/// The contents of the queue
 	QueueType m_Contents;
-- 
cgit v1.2.3


From 33c6ff872e72563b6e888476b66c4e9c19f8c840 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 11 Dec 2014 14:34:09 +0100
Subject: Cosmetic touchups.

Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
---
 src/OSSupport/Event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/OSSupport')

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index d6ba937f9..760e536a1 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -63,7 +63,7 @@ bool cEvent::Wait(unsigned a_TimeoutMSec)
 		}  // switch (wait_until())
 	}  // while (m_ShouldWait && not timeout)
 
-	// The wait timed out in the while() condition:
+	// The wait timed out in the while condition:
 	return false;
 }
 
-- 
cgit v1.2.3