summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-25 00:34:54 +0100
committerMattes D <github@xoft.cz>2014-12-25 00:34:54 +0100
commit081e7ddd028d9382bd52c2b117dae6b6f84225e5 (patch)
tree6e2564eaee74ab2615bb0c1b6925498da183ee97
parentMerge pull request #1686 from mc-server/PlaceBlockRefactor (diff)
downloadcuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar.gz
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar.bz2
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar.lz
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar.xz
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.tar.zst
cuberite-081e7ddd028d9382bd52c2b117dae6b6f84225e5.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/IsThread.cpp18
-rw-r--r--src/OSSupport/IsThread.h19
2 files changed, 30 insertions, 7 deletions
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 94bed1f56..55e96b622 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -68,11 +68,22 @@ cIsThread::~cIsThread()
+void cIsThread::DoExecute(void)
+{
+ m_evtStart.Wait();
+ Execute();
+}
+
+
+
+
+
bool cIsThread::Start(void)
{
try
{
- m_Thread = std::thread(&cIsThread::Execute, this);
+ // Initialize the thread:
+ m_Thread = std::thread(&cIsThread::DoExecute, this);
#if defined (_MSC_VER) && defined(_DEBUG)
if (!m_ThreadName.empty())
@@ -81,9 +92,12 @@ bool cIsThread::Start(void)
}
#endif
+ // Notify the thread that initialization is complete and it can run its code safely:
+ m_evtStart.Set();
+
return true;
}
- catch (std::system_error & a_Exception)
+ catch (const std::system_error & a_Exception)
{
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;
diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h
index 131c6950e..f642c8724 100644
--- a/src/OSSupport/IsThread.h
+++ b/src/OSSupport/IsThread.h
@@ -25,23 +25,28 @@ In the descending class' constructor call the Start() method to start the thread
class cIsThread
{
protected:
- /// This is the main thread entrypoint
+ /** This is the main thread entrypoint.
+ This function, overloaded by the descendants, is called in the new thread. */
virtual void Execute(void) = 0;
- /// The overriden Execute() method should check this value periodically and terminate if this is true
+ /** The overriden Execute() method should check this value periodically and terminate if this is true. */
volatile bool m_ShouldTerminate;
+private:
+ /** Wrapper for Execute() that waits for the initialization event, to prevent race conditions in thread initialization. */
+ void DoExecute(void);
+
public:
cIsThread(const AString & a_ThreadName);
virtual ~cIsThread();
- /// Starts the thread; returns without waiting for the actual start
+ /** Starts the thread; returns without waiting for the actual start. */
bool Start(void);
- /// Signals the thread to terminate and waits until it's finished
+ /** Signals the thread to terminate and waits until it's finished. */
void Stop(void);
- /// Waits for the thread to finish. Doesn't signalize the ShouldTerminate flag
+ /** Waits for the thread to finish. Doesn't signalize the ShouldTerminate flag. */
bool Wait(void);
/** Returns true if the thread calling this function is the thread contained within this object. */
@@ -50,6 +55,10 @@ public:
protected:
AString m_ThreadName;
std::thread m_Thread;
+
+ /** The event that is used to wait with the thread's execution until the thread object is fully initialized.
+ This prevents the IsCurrentThread() call to fail because of a race-condition. */
+ cEvent m_evtStart;
} ;