summaryrefslogtreecommitdiffstats
path: root/src/OSSupport/Event.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-23 11:20:25 +0200
committerMattes D <github@xoft.cz>2014-10-23 11:20:25 +0200
commit82472d09acacba9fcf31765e4abbfddd3ffbbcd1 (patch)
tree005e1805e316be68c23e1b0408c5bddb83177e7c /src/OSSupport/Event.h
parentRemoved the "conditional expression is constant" warning. (diff)
downloadcuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar.gz
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar.bz2
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar.lz
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar.xz
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.tar.zst
cuberite-82472d09acacba9fcf31765e4abbfddd3ffbbcd1.zip
Diffstat (limited to 'src/OSSupport/Event.h')
-rw-r--r--src/OSSupport/Event.h33
1 files changed, 17 insertions, 16 deletions
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