From 3d16e8a64e9ef76f407270ef092671a1be7bf346 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Thu, 16 Nov 2023 15:34:25 +0100
Subject: changed posix event implementation to use std::atomic instead of
 volatile (#547)

---
 src/zencore/thread.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/zencore/thread.cpp')

diff --git a/src/zencore/thread.cpp b/src/zencore/thread.cpp
index 758e88350..27a5ec1ae 100644
--- a/src/zencore/thread.cpp
+++ b/src/zencore/thread.cpp
@@ -152,12 +152,12 @@ RwLock::ReleaseExclusive() noexcept
 
 //////////////////////////////////////////////////////////////////////////
 
-#if !ZEN_PLATFORM_WINDOWS
+#if !ZEN_USE_WINDOWS_EVENTS
 struct EventInner
 {
 	std::mutex				Mutex;
 	std::condition_variable CondVar;
-	bool volatile bSet = false;
+	std::atomic_bool		bSet{false};
 };
 #endif	// !ZEN_PLATFORM_WINDOWS
 
@@ -166,7 +166,7 @@ Event::Event()
 	bool bManualReset  = true;
 	bool bInitialState = false;
 
-#if ZEN_PLATFORM_WINDOWS
+#if ZEN_USE_WINDOWS_EVENTS
 	m_EventHandle = CreateEvent(nullptr, bManualReset, bInitialState, nullptr);
 #else
 	ZEN_UNUSED(bManualReset);
@@ -184,7 +184,7 @@ Event::~Event()
 void
 Event::Set()
 {
-#if ZEN_PLATFORM_WINDOWS
+#if ZEN_USE_WINDOWS_EVENTS
 	SetEvent(m_EventHandle);
 #else
 	auto* Inner	  = (EventInner*)m_EventHandle;
@@ -199,7 +199,7 @@ Event::Set()
 void
 Event::Reset()
 {
-#if ZEN_PLATFORM_WINDOWS
+#if ZEN_USE_WINDOWS_EVENTS
 	ResetEvent(m_EventHandle);
 #else
 	auto* Inner = (EventInner*)m_EventHandle;
@@ -213,7 +213,7 @@ Event::Reset()
 void
 Event::Close()
 {
-#if ZEN_PLATFORM_WINDOWS
+#if ZEN_USE_WINDOWS_EVENTS
 	CloseHandle(m_EventHandle);
 #else
 	auto* Inner = (EventInner*)m_EventHandle;
@@ -225,7 +225,7 @@ Event::Close()
 bool
 Event::Wait(int TimeoutMs)
 {
-#if ZEN_PLATFORM_WINDOWS
+#if ZEN_USE_WINDOWS_EVENTS
 	using namespace std::literals;
 
 	const DWORD Timeout = (TimeoutMs < 0) ? INFINITE : TimeoutMs;
@@ -250,14 +250,14 @@ Event::Wait(int TimeoutMs)
 			return true;
 		}
 
-		return Inner->CondVar.wait_for(Lock, std::chrono::milliseconds(TimeoutMs), [&] { return Inner->bSet; });
+		return Inner->CondVar.wait_for(Lock, std::chrono::milliseconds(TimeoutMs), [&] { return Inner->bSet.load(); });
 	}
 
 	std::unique_lock Lock(Inner->Mutex);
 
 	if (!Inner->bSet)
 	{
-		Inner->CondVar.wait(Lock, [&] { return Inner->bSet; });
+		Inner->CondVar.wait(Lock, [&] { return Inner->bSet.load(); });
 	}
 
 	return true;
-- 
cgit v1.2.3