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

Merge pull request #371 from BratSinot/boost_asio_no_deprecated 

Switch from deprecated io_service to io_context.
This commit is contained in:
Emiel Bruijntjes 2020-10-14 09:38:16 +02:00 committed by GitHub
parent eb732aa162 41019cb943
commit 8f85ad7818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
include/amqpcpp/libboostasio.h
View File

@ -25,10 +25,11 @@
*/ */
#include <memory> #include <memory>
#include <boost/asio/io_service.hpp> #include <boost/asio/io_context.hpp>
#include <boost/asio/strand.hpp> #include <boost/asio/strand.hpp>
#include <boost/asio/deadline_timer.hpp> #include <boost/asio/deadline_timer.hpp>
#include <boost/asio/posix/stream_descriptor.hpp> #include <boost/asio/posix/stream_descriptor.hpp>
#include <boost/asio/dispatch.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
@ -55,23 +56,23 @@ class LibBoostAsioHandler : public virtual TcpHandler
protected: protected:
/** /**
* Helper class that wraps a boost io_service socket monitor. * Helper class that wraps a boost io_context socket monitor.
*/ */
class Watcher : public virtual std::enable_shared_from_this<Watcher> class Watcher : public virtual std::enable_shared_from_this<Watcher>
{ {
private: private:
/** /**
* The boost asio io_service which is responsible for detecting events. * The boost asio io_context which is responsible for detecting events.
* @var class boost::asio::io_service& * @var class boost::asio::io_context&
*/ */
boost::asio::io_service & _ioservice; boost::asio::io_context & _iocontext;
using strand_weak_ptr = std::weak_ptr<boost::asio::io_context::strand>;
using strand_weak_ptr = std::weak_ptr<boost::asio::io_service::strand>;
/** /**
* The boost asio io_service::strand managed pointer. * The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_service> * @var class std::shared_ptr<boost::asio::io_context>
*/ */
strand_weak_ptr _wpstrand; strand_weak_ptr _wpstrand;
@ -112,7 +113,7 @@ protected:
/** /**
* Builds a io handler callback that executes the io callback in a strand. * Builds a io handler callback that executes the io callback in a strand.
* @param io_handler The handler callback to dispatch * @param io_handler The handler callback to dispatch
* @return handler_cb A function wrapping the execution of the handler function in a io_service::strand. * @return handler_cb A function wrapping the execution of the handler function in a io_context::strand.
*/ */
handler_cb get_dispatch_wrapper(io_handler fn) handler_cb get_dispatch_wrapper(io_handler fn)
{ {
@ -126,10 +127,10 @@ protected:
fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled), std::size_t{0}); fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled), std::size_t{0});
return; return;
} }
strand->dispatch(boost::bind(fn, ec, bytes_transferred)); boost::asio::dispatch(strand->context().get_executor(), boost::bind(fn, ec, bytes_transferred));
}; };
} }
/** /**
* Binds and returns a read handler for the io operation. * Binds and returns a read handler for the io operation.
* @param connection The connection being watched. * @param connection The connection being watched.
@ -140,8 +141,8 @@ protected:
{ {
auto fn = boost::bind(&Watcher::read_handler, auto fn = boost::bind(&Watcher::read_handler,
this, this,
_1, boost::placeholders::_1,
_2, boost::placeholders::_2,
PTR_FROM_THIS(Watcher), PTR_FROM_THIS(Watcher),
connection, connection,
fd); fd);
@ -158,8 +159,8 @@ protected:
{ {
auto fn = boost::bind(&Watcher::write_handler, auto fn = boost::bind(&Watcher::write_handler,
this, this,
_1, boost::placeholders::_1,
_2, boost::placeholders::_2,
PTR_FROM_THIS(Watcher), PTR_FROM_THIS(Watcher),
connection, connection,
fd); fd);
@ -167,7 +168,7 @@ protected:
} }
/** /**
* Handler method that is called by boost's io_service when the socket pumps a read event. * Handler method that is called by boost's io_context when the socket pumps a read event.
* @param ec The status of the callback. * @param ec The status of the callback.
* @param bytes_transferred The number of bytes transferred. * @param bytes_transferred The number of bytes transferred.
* @param awpWatcher A weak pointer to this object. * @param awpWatcher A weak pointer to this object.
@ -193,7 +194,7 @@ protected:
connection->process(fd, AMQP::readable); connection->process(fd, AMQP::readable);
_read_pending = true; _read_pending = true;
_socket.async_read_some( _socket.async_read_some(
boost::asio::null_buffers(), boost::asio::null_buffers(),
get_read_handler(connection, fd)); get_read_handler(connection, fd));
@ -201,7 +202,7 @@ protected:
} }
/** /**
* Handler method that is called by boost's io_service when the socket pumps a write event. * Handler method that is called by boost's io_context when the socket pumps a write event.
* @param ec The status of the callback. * @param ec The status of the callback.
* @param bytes_transferred The number of bytes transferred. * @param bytes_transferred The number of bytes transferred.
* @param awpWatcher A weak pointer to this object. * @param awpWatcher A weak pointer to this object.
@ -236,18 +237,18 @@ protected:
public: public:
/** /**
* Constructor- initialises the watcher and assigns the filedescriptor to * Constructor- initialises the watcher and assigns the filedescriptor to
* a boost socket for monitoring. * a boost socket for monitoring.
* @param io_service The boost io_service * @param io_context The boost io_context
* @param wpstrand A weak pointer to a io_service::strand instance. * @param wpstrand A weak pointer to a io_context::strand instance.
* @param fd The filedescriptor being watched * @param fd The filedescriptor being watched
*/ */
Watcher(boost::asio::io_service &io_service, Watcher(boost::asio::io_context &io_context,
const strand_weak_ptr wpstrand, const strand_weak_ptr wpstrand,
const int fd) : const int fd) :
_ioservice(io_service), _iocontext(io_context),
_wpstrand(wpstrand), _wpstrand(wpstrand),
_socket(_ioservice) _socket(io_context)
{ {
_socket.assign(fd); _socket.assign(fd);
@ -314,16 +315,16 @@ protected:
private: private:
/** /**
* The boost asio io_service which is responsible for detecting events. * The boost asio io_context which is responsible for detecting events.
* @var class boost::asio::io_service& * @var class boost::asio::io_context&
*/ */
boost::asio::io_service & _ioservice; boost::asio::io_context & _iocontext;
using strand_weak_ptr = std::weak_ptr<boost::asio::io_service::strand>; using strand_weak_ptr = std::weak_ptr<boost::asio::io_context::strand>;
/** /**
* The boost asio io_service::strand managed pointer. * The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_service> * @var class std::shared_ptr<boost::asio::io_context>
*/ */
strand_weak_ptr _wpstrand; strand_weak_ptr _wpstrand;
@ -345,7 +346,7 @@ protected:
{ {
const auto fn = boost::bind(&Timer::timeout, const auto fn = boost::bind(&Timer::timeout,
this, this,
_1, boost::placeholders::_1,
PTR_FROM_THIS(Timer), PTR_FROM_THIS(Timer),
connection, connection,
timeout); timeout);
@ -360,7 +361,7 @@ protected:
fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled)); fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled));
return; return;
} }
strand->dispatch(boost::bind(fn, ec)); boost::asio::dispatch(strand->context().get_executor(), boost::bind(fn, ec));
}; };
} }
@ -409,14 +410,14 @@ protected:
public: public:
/** /**
* Constructor * Constructor
* @param io_service The boost asio io_service. * @param io_context The boost asio io_context.
* @param wpstrand A weak pointer to a io_service::strand instance. * @param wpstrand A weak pointer to a io_context::strand instance.
*/ */
Timer(boost::asio::io_service &io_service, Timer(boost::asio::io_context &io_context,
const strand_weak_ptr wpstrand) : const strand_weak_ptr wpstrand) :
_ioservice(io_service), _iocontext(io_context),
_wpstrand(wpstrand), _wpstrand(wpstrand),
_timer(_ioservice) _timer(io_context)
{ {
} }
@ -457,16 +458,16 @@ protected:
}; };
/** /**
* The boost asio io_service. * The boost asio io_context.
* @var class boost::asio::io_service& * @var class boost::asio::io_context&
*/ */
boost::asio::io_service & _ioservice; boost::asio::io_context & _iocontext;
using strand_shared_ptr = std::shared_ptr<boost::asio::io_service::strand>; using strand_shared_ptr = std::shared_ptr<boost::asio::io_context::strand>;
/** /**
* The boost asio io_service::strand managed pointer. * The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_service> * @var class std::shared_ptr<boost::asio::io_context>
*/ */
strand_shared_ptr _strand; strand_shared_ptr _strand;
@ -477,7 +478,7 @@ protected:
std::map<int, std::shared_ptr<Watcher> > _watchers; std::map<int, std::shared_ptr<Watcher> > _watchers;
/** /**
* The boost asio io_service::deadline_timer managed pointer. * The boost asio io_context::deadline_timer managed pointer.
* THIS IS DISABLED FOR NOW BECAUSE THIS BREAKS IF THERE IS MORE THAN ONE CONNECTION * THIS IS DISABLED FOR NOW BECAUSE THIS BREAKS IF THERE IS MORE THAN ONE CONNECTION
* @var class std::shared_ptr<Timer> * @var class std::shared_ptr<Timer>
*/ */
@ -503,8 +504,8 @@ protected:
if (flags == 0){ return; } if (flags == 0){ return; }
// construct a new pair (watcher/timer), and put it in the map // construct a new pair (watcher/timer), and put it in the map
const std::shared_ptr<Watcher> apWatcher = const std::shared_ptr<Watcher> apWatcher =
std::make_shared<Watcher>(_ioservice, _strand, fd); std::make_shared<Watcher>(_iocontext, _strand, fd);
_watchers[fd] = apWatcher; _watchers[fd] = apWatcher;
@ -556,12 +557,12 @@ public:
/** /**
* Constructor * Constructor
* @param io_service The boost io_service to wrap * @param io_context The boost io_context to wrap
*/ */
explicit LibBoostAsioHandler(boost::asio::io_service &io_service) : explicit LibBoostAsioHandler(boost::asio::io_context &io_context) :
_ioservice(io_service), _iocontext(io_context),
_strand(std::make_shared<boost::asio::io_service::strand>(_ioservice)) _strand(std::make_shared<boost::asio::io_context::strand>(_iocontext))
//_timer(std::make_shared<Timer>(_ioservice,_strand)) //_timer(std::make_shared<Timer>(_iocontext,_strand))
{ {
} }
@ -575,12 +576,12 @@ public:
LibBoostAsioHandler(const LibBoostAsioHandler &that) = delete; LibBoostAsioHandler(const LibBoostAsioHandler &that) = delete;
/** /**
* Returns a reference to the boost io_service object that is being used. * Returns a reference to the boost io_context object that is being used.
* @return The boost io_service object. * @return The boost io_context object.
*/ */
boost::asio::io_service &service() boost::asio::io_context &service()
{ {
return _ioservice; return _iocontext;
} }
/** /**