jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure threads are synchronized (fixes 474)

This commit is contained in:
Emiel Bruijntjes 2022-08-09 23:10:07 +02:00
parent db6f2f23dc
commit c273d93625
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/linux_tcp/tcpresolver.h
View File

@ -238,7 +238,7 @@ public:
_parent->onIdle(this, _pipe.in(), 0); _parent->onIdle(this, _pipe.in(), 0);
// wait for the thread to be ready // wait for the thread to be ready
_thread.join(); if (_thread.joinable()) _thread.join();
} }
/** /**
@ -249,6 +249,7 @@ public:
/** /**
* Proceed to the next state * Proceed to the next state
* @param monitor object that checks if the connection still exists
* @return TcpState * * @return TcpState *
*/ */
TcpState *proceed(const Monitor &monitor) TcpState *proceed(const Monitor &monitor)
@ -256,6 +257,12 @@ public:
// prevent exceptions // prevent exceptions
try try
{ {
// the other thread must be ready by now, so we join it, which also guarantees us
// that the memory of the two threads have been synchronized (without this call
// it is possible that the memory of the threads have not been synchronized, and
// _socket has not yet been set)
_thread.join();
// socket should be connected by now // socket should be connected by now
if (_socket < 0) throw std::runtime_error(_error.data()); if (_socket < 0) throw std::runtime_error(_error.data());