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

Merge pull request #199 from tud-zih-energy/fix-asio-close2 

Fix shutdown issues with libboostasio
This commit is contained in:
Emiel Bruijntjes 2018-03-12 14:17:41 +01:00 committed by GitHub
parent fe88874d69 8a6adae8e6
commit 0f4224e3bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/libboostasio.cpp
View File

@ -30,9 +30,6 @@ int main()
// note: we suggest use of 2 threads - normally one is fin (we are simply demonstrating thread safety). // note: we suggest use of 2 threads - normally one is fin (we are simply demonstrating thread safety).
boost::asio::io_service service(4); boost::asio::io_service service(4);
// create a work object to process our events.
boost::asio::io_service::work work(service);
// handler for libev // handler for libev
AMQP::LibBoostAsioHandler handler(service); AMQP::LibBoostAsioHandler handler(service);

20
include/amqpcpp/libboostasio.h
View File

@ -36,9 +36,9 @@
// C++17 has 'weak_from_this()' support. // C++17 has 'weak_from_this()' support.
#if __cplusplus >= 201701L #if __cplusplus >= 201701L
#define PTR_FROM_THIS weak_from_this #define PTR_FROM_THIS(T) weak_from_this()
#else #else
#define PTR_FROM_THIS shared_from_this #define PTR_FROM_THIS(T) std::weak_ptr<T>(shared_from_this())
#endif #endif
/** /**
@ -142,7 +142,7 @@ protected:
this, this,
_1, _1,
_2, _2,
PTR_FROM_THIS(), PTR_FROM_THIS(Watcher),
connection, connection,
fd); fd);
return get_dispatch_wrapper(fn); return get_dispatch_wrapper(fn);
@ -160,7 +160,7 @@ protected:
this, this,
_1, _1,
_2, _2,
PTR_FROM_THIS(), PTR_FROM_THIS(Watcher),
connection, connection,
fd); fd);
return get_dispatch_wrapper(fn); return get_dispatch_wrapper(fn);
@ -346,7 +346,7 @@ protected:
const auto fn = boost::bind(&Timer::timeout, const auto fn = boost::bind(&Timer::timeout,
this, this,
_1, _1,
PTR_FROM_THIS(), PTR_FROM_THIS(Timer),
connection, connection,
timeout); timeout);
@ -583,6 +583,16 @@ public:
* Destructor * Destructor
*/ */
~LibBoostAsioHandler() override = default; ~LibBoostAsioHandler() override = default;
/**
* Make sure to stop the heartbeat timer after the connection is closed.
* Otherwise it will keep the service running forever.
*/
void onClosed(TcpConnection* connection) override
{
(void)connection;
_timer.reset();
}
}; };