Skip to content

Commit

Permalink
Merge pull request #371 from BratSinot/boost_asio_no_deprecated
Browse files Browse the repository at this point in the history 
Switch from deprecated io_service to io_context.
  • Loading branch information
@EmielBruijntjes
EmielBruijntjes authored Oct 14, 2020
2 parents eb732aa + 41019cb commit 8f85ad7
Showing 1 changed file with 57 additions and 56 deletions.
113 changes: 57 additions & 56 deletions include/amqpcpp/libboostasio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@
*/
#include <memory>

#include <boost/asio/io_service.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/strand.hpp>
#include <boost/asio/deadline_timer.hpp>
#include <boost/asio/posix/stream_descriptor.hpp>
#include <boost/asio/dispatch.hpp>
#include <boost/bind.hpp>
#include <boost/function.hpp>

Expand All @@ -55,23 +56,23 @@ class LibBoostAsioHandler : public virtual TcpHandler
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>
{
private:

/**
* The boost asio io_service which is responsible for detecting events.
* @var class boost::asio::io_service&
* The boost asio io_context which is responsible for detecting events.
* @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.
* @var class std::shared_ptr<boost::asio::io_service>
* The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_context>
*/
strand_weak_ptr _wpstrand;

Expand Down Expand Up @@ -112,7 +113,7 @@ class LibBoostAsioHandler : public virtual TcpHandler
/**
* Builds a io handler callback that executes the io callback in a strand.
* @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)
{
Expand All @@ -126,10 +127,10 @@ class LibBoostAsioHandler : public virtual TcpHandler
fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled), std::size_t{0});
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.
* @param connection The connection being watched.
Expand All @@ -140,8 +141,8 @@ class LibBoostAsioHandler : public virtual TcpHandler
{
auto fn = boost::bind(&Watcher::read_handler,
this,
_1,
_2,
boost::placeholders::_1,
boost::placeholders::_2,
PTR_FROM_THIS(Watcher),
connection,
fd);
Expand All @@ -158,16 +159,16 @@ class LibBoostAsioHandler : public virtual TcpHandler
{
auto fn = boost::bind(&Watcher::write_handler,
this,
_1,
_2,
boost::placeholders::_1,
boost::placeholders::_2,
PTR_FROM_THIS(Watcher),
connection,
fd);
return get_dispatch_wrapper(fn);
}

/**
* 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 bytes_transferred The number of bytes transferred.
* @param awpWatcher A weak pointer to this object.
Expand All @@ -193,15 +194,15 @@ class LibBoostAsioHandler : public virtual TcpHandler
connection->process(fd, AMQP::readable);

_read_pending = true;

_socket.async_read_some(
boost::asio::null_buffers(),
get_read_handler(connection, fd));
}
}

/**
* 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 bytes_transferred The number of bytes transferred.
* @param awpWatcher A weak pointer to this object.
Expand Down Expand Up @@ -236,18 +237,18 @@ class LibBoostAsioHandler : public virtual TcpHandler

public:
/**
* Constructor- initialises the watcher and assigns the filedescriptor to
* Constructor- initialises the watcher and assigns the filedescriptor to
* a boost socket for monitoring.
* @param io_service The boost io_service
* @param wpstrand A weak pointer to a io_service::strand instance.
* @param io_context The boost io_context
* @param wpstrand A weak pointer to a io_context::strand instance.
* @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 int fd) :
_ioservice(io_service),
_iocontext(io_context),
_wpstrand(wpstrand),
_socket(_ioservice)
_socket(io_context)
{
_socket.assign(fd);

Expand Down Expand Up @@ -314,16 +315,16 @@ class LibBoostAsioHandler : public virtual TcpHandler
private:

/**
* The boost asio io_service which is responsible for detecting events.
* @var class boost::asio::io_service&
* The boost asio io_context which is responsible for detecting events.
* @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.
* @var class std::shared_ptr<boost::asio::io_service>
* The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_context>
*/
strand_weak_ptr _wpstrand;

Expand All @@ -345,7 +346,7 @@ class LibBoostAsioHandler : public virtual TcpHandler
{
const auto fn = boost::bind(&Timer::timeout,
this,
_1,
boost::placeholders::_1,
PTR_FROM_THIS(Timer),
connection,
timeout);
Expand All @@ -360,7 +361,7 @@ class LibBoostAsioHandler : public virtual TcpHandler
fn(boost::system::errc::make_error_code(boost::system::errc::operation_canceled));
return;
}
strand->dispatch(boost::bind(fn, ec));
boost::asio::dispatch(strand->context().get_executor(), boost::bind(fn, ec));
};
}

Expand Down Expand Up @@ -409,14 +410,14 @@ class LibBoostAsioHandler : public virtual TcpHandler
public:
/**
* Constructor
* @param io_service The boost asio io_service.
* @param wpstrand A weak pointer to a io_service::strand instance.
* @param io_context The boost asio io_context.
* @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) :
_ioservice(io_service),
_iocontext(io_context),
_wpstrand(wpstrand),
_timer(_ioservice)
_timer(io_context)
{

}
Expand Down Expand Up @@ -457,16 +458,16 @@ class LibBoostAsioHandler : public virtual TcpHandler
};

/**
* The boost asio io_service.
* @var class boost::asio::io_service&
* The boost asio io_context.
* @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.
* @var class std::shared_ptr<boost::asio::io_service>
* The boost asio io_context::strand managed pointer.
* @var class std::shared_ptr<boost::asio::io_context>
*/
strand_shared_ptr _strand;

Expand All @@ -477,7 +478,7 @@ class LibBoostAsioHandler : public virtual TcpHandler
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
* @var class std::shared_ptr<Timer>
*/
Expand All @@ -503,8 +504,8 @@ class LibBoostAsioHandler : public virtual TcpHandler
if (flags == 0){ return; }

// construct a new pair (watcher/timer), and put it in the map
const std::shared_ptr<Watcher> apWatcher =
std::make_shared<Watcher>(_ioservice, _strand, fd);
const std::shared_ptr<Watcher> apWatcher =
std::make_shared<Watcher>(_iocontext, _strand, fd);

_watchers[fd] = apWatcher;

Expand Down Expand Up @@ -556,12 +557,12 @@ class LibBoostAsioHandler : public virtual TcpHandler

/**
* 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) :
_ioservice(io_service),
_strand(std::make_shared<boost::asio::io_service::strand>(_ioservice))
//_timer(std::make_shared<Timer>(_ioservice,_strand))
explicit LibBoostAsioHandler(boost::asio::io_context &io_context) :
_iocontext(io_context),
_strand(std::make_shared<boost::asio::io_context::strand>(_iocontext))
//_timer(std::make_shared<Timer>(_iocontext,_strand))
{

}
Expand All @@ -575,12 +576,12 @@ class LibBoostAsioHandler : public virtual TcpHandler
LibBoostAsioHandler(const LibBoostAsioHandler &that) = delete;

/**
* Returns a reference to the boost io_service object that is being used.
* @return The boost io_service object.
* Returns a reference to the boost io_context object that is being used.
* @return The boost io_context object.
*/
boost::asio::io_service &service()
boost::asio::io_context &service()
{
return _ioservice;
return _iocontext;
}

/**
Expand Down

0 comments on commit 8f85ad7

Please sign in to comment.