1 files changed, 35 insertions, 121 deletions

diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 87bc110ce..d6ba937f9 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -12,137 +12,59 @@
 
 
 
-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
+	m_ShouldWait = true;
 }
 
 
 
 
 
-void cEvent::Wait(void)
+bool cEvent::Wait(unsigned a_TimeoutMSec)
 {
-	#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
-}
-
-
-
-
-
-bool cEvent::Wait(int a_TimeoutMSec)
-{
-	#ifdef _WIN32
-		DWORD res = WaitForSingleObject(m_Event, (DWORD)a_TimeoutMSec);
-		switch (res)
+	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))
+	{
+		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();
 }