summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-02-18 22:41:22 +0100
committerMattes D <github@xoft.cz>2015-02-18 22:41:22 +0100
commit70d54054e332c05d94e69b1eeca45a8773115c14 (patch)
tree91489591bea80cabc3dd4dd66a06531506354418
parentInfoReg: Fixed MultiCommand return values. (diff)
downloadcuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar.gz
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar.bz2
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar.lz
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar.xz
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.tar.zst
cuberite-70d54054e332c05d94e69b1eeca45a8773115c14.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/NetworkSingleton.cpp6
-rw-r--r--src/OSSupport/NetworkSingleton.h6
2 files changed, 5 insertions, 7 deletions
diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp
index 000b17641..358e24438 100644
--- a/src/OSSupport/NetworkSingleton.cpp
+++ b/src/OSSupport/NetworkSingleton.cpp
@@ -63,8 +63,7 @@ cNetworkSingleton::cNetworkSingleton(void):
}
// Create the event loop thread:
- std::thread EventLoopThread(RunEventLoop, this);
- EventLoopThread.detach();
+ m_EventLoopThread = std::thread(RunEventLoop, this);
}
@@ -98,7 +97,7 @@ void cNetworkSingleton::Terminate(void)
// Wait for the LibEvent event loop to terminate:
event_base_loopbreak(m_EventBase);
- m_EventLoopTerminated.Wait();
+ m_EventLoopThread.join();
// Remove all objects:
{
@@ -143,7 +142,6 @@ void cNetworkSingleton::LogCallback(int a_Severity, const char * a_Msg)
void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self)
{
event_base_loop(a_Self->m_EventBase, EVLOOP_NO_EXIT_ON_EMPTY);
- a_Self->m_EventLoopTerminated.Set();
}
diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h
index e27e19012..0536a1c82 100644
--- a/src/OSSupport/NetworkSingleton.h
+++ b/src/OSSupport/NetworkSingleton.h
@@ -116,12 +116,12 @@ protected:
/** Mutex protecting all containers against multithreaded access. */
cCriticalSection m_CS;
- /** Event that gets signalled when the event loop terminates. */
- cEvent m_EventLoopTerminated;
-
/** Set to true if Terminate has been called. */
volatile bool m_HasTerminated;
+ /** The thread in which the main LibEvent loop runs. */
+ std::thread m_EventLoopThread;
+
/** Initializes the LibEvent internals. */
cNetworkSingleton(void);