forked from boostorg/mqtt5
Remove deprecated API usage
Summary: related to T13767 Reviewers: ivica Reviewed By: ivica Subscribers: miljen, iljazovic Differential Revision: https://repo.mireo.local/D28958
This commit is contained in:
@ -67,7 +67,7 @@ public:
|
|||||||
|
|
||||||
authority_path ap = _owner._servers[_owner._current_host];
|
authority_path ap = _owner._servers[_owner._current_host];
|
||||||
|
|
||||||
_owner._connect_timer.expires_from_now(std::chrono::seconds(5));
|
_owner._connect_timer.expires_after(std::chrono::seconds(5));
|
||||||
|
|
||||||
auto timed_resolve = asioex::make_parallel_group(
|
auto timed_resolve = asioex::make_parallel_group(
|
||||||
_owner._resolver.async_resolve(ap.host, ap.port, asio::deferred),
|
_owner._resolver.async_resolve(ap.host, ap.port, asio::deferred),
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void perform() {
|
void perform() {
|
||||||
_ping_timer->expires_from_now(compute_wait_time());
|
_ping_timer->expires_after(compute_wait_time());
|
||||||
_ping_timer->async_wait(
|
_ping_timer->async_wait(
|
||||||
asio::prepend(std::move(*this), on_timer {})
|
asio::prepend(std::move(*this), on_timer {})
|
||||||
);
|
);
|
||||||
|
@ -50,7 +50,7 @@ public:
|
|||||||
auto stream_ptr = _owner._stream_ptr;
|
auto stream_ptr = _owner._stream_ptr;
|
||||||
|
|
||||||
if (_owner.was_connected()) {
|
if (_owner.was_connected()) {
|
||||||
_owner._read_timer.expires_from_now(wait_for);
|
_owner._read_timer.expires_after(wait_for);
|
||||||
|
|
||||||
auto timed_read = asioex::make_parallel_group(
|
auto timed_read = asioex::make_parallel_group(
|
||||||
stream_ptr->async_read_some(buffer, asio::deferred),
|
stream_ptr->async_read_some(buffer, asio::deferred),
|
||||||
|
@ -112,7 +112,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void backoff_and_reconnect() {
|
void backoff_and_reconnect() {
|
||||||
_owner._connect_timer.expires_from_now(_generator.generate());
|
_owner._connect_timer.expires_after(_generator.generate());
|
||||||
_owner._connect_timer.async_wait(
|
_owner._connect_timer.async_wait(
|
||||||
asio::prepend(std::move(*this), on_backoff {})
|
asio::prepend(std::move(*this), on_backoff {})
|
||||||
);
|
);
|
||||||
@ -151,7 +151,7 @@ public:
|
|||||||
);
|
);
|
||||||
|
|
||||||
// wait max 5 seconds for the connect (handshake) op to finish
|
// wait max 5 seconds for the connect (handshake) op to finish
|
||||||
_owner._connect_timer.expires_from_now(std::chrono::seconds(5));
|
_owner._connect_timer.expires_after(std::chrono::seconds(5));
|
||||||
|
|
||||||
auto init_connect = [](
|
auto init_connect = [](
|
||||||
auto handler, typename Owner::stream_type& stream,
|
auto handler, typename Owner::stream_type& stream,
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
void perform(CompletionHandler&& handler) {
|
void perform(CompletionHandler&& handler) {
|
||||||
_cancel_slot = asio::get_associated_cancellation_slot(handler);
|
_cancel_slot = asio::get_associated_cancellation_slot(handler);
|
||||||
|
|
||||||
_timer->expires_from_now(_delay);
|
_timer->expires_after(_delay);
|
||||||
_timer->async_wait(
|
_timer->async_wait(
|
||||||
asio::prepend(std::move(*this), on_timer {}, std::move(handler))
|
asio::prepend(std::move(*this), on_timer {}, std::move(handler))
|
||||||
);
|
);
|
||||||
|
@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
#include <boost/algorithm/string/join.hpp>
|
#include <boost/algorithm/string/join.hpp>
|
||||||
|
|
||||||
|
#include <boost/asio/buffer.hpp>
|
||||||
|
|
||||||
#include <boost/range/algorithm/transform.hpp>
|
#include <boost/range/algorithm/transform.hpp>
|
||||||
|
|
||||||
#include <async_mqtt5/detail/control_packet.hpp>
|
#include <async_mqtt5/detail/control_packet.hpp>
|
||||||
@ -358,11 +360,17 @@ inline std::string to_readable_packet(std::string packet) {
|
|||||||
|
|
||||||
template <typename ConstBufferSequence>
|
template <typename ConstBufferSequence>
|
||||||
std::vector<std::string> to_readable_packets(const ConstBufferSequence& buffers) {
|
std::vector<std::string> to_readable_packets(const ConstBufferSequence& buffers) {
|
||||||
|
namespace asio = boost::asio;
|
||||||
|
|
||||||
std::vector<std::string> content;
|
std::vector<std::string> content;
|
||||||
|
|
||||||
for (const auto& buff : buffers)
|
for (
|
||||||
|
auto it = asio::buffer_sequence_begin(buffers);
|
||||||
|
it != asio::buffer_sequence_end(buffers);
|
||||||
|
it++
|
||||||
|
)
|
||||||
content.push_back(
|
content.push_back(
|
||||||
to_readable_packet(std::string { (const char*) buff.data(), buff.size() })
|
to_readable_packet(std::string { (const char*)it->data(), it->size() })
|
||||||
);
|
);
|
||||||
|
|
||||||
return content;
|
return content;
|
||||||
|
@ -36,7 +36,7 @@ class pending_read {
|
|||||||
public:
|
public:
|
||||||
template <typename MutableBuffer, typename Handler>
|
template <typename MutableBuffer, typename Handler>
|
||||||
pending_read(const MutableBuffer& buffer, Handler&& handler) :
|
pending_read(const MutableBuffer& buffer, Handler&& handler) :
|
||||||
_buffer_data(asio::buffer_cast<void*>(buffer)),
|
_buffer_data(buffer.data()),
|
||||||
_buffer_size(buffer.size()),
|
_buffer_size(buffer.size()),
|
||||||
_handler(std::move(handler))
|
_handler(std::move(handler))
|
||||||
{}
|
{}
|
||||||
@ -133,8 +133,9 @@ public:
|
|||||||
auto reply_action = _broker_side.pop_reply_action();
|
auto reply_action = _broker_side.pop_reply_action();
|
||||||
|
|
||||||
size_t bytes_written = std::accumulate(
|
size_t bytes_written = std::accumulate(
|
||||||
std::begin(buffers), std::end(buffers), size_t(0),
|
asio::buffer_sequence_begin(buffers),
|
||||||
[](size_t a, const auto& b) { return a + b.size(); }
|
asio::buffer_sequence_end(buffers),
|
||||||
|
size_t(0), [](size_t a, const auto& b) { return a + b.size(); }
|
||||||
);
|
);
|
||||||
|
|
||||||
executor_type ex = get_executor();
|
executor_type ex = get_executor();
|
||||||
@ -143,12 +144,12 @@ public:
|
|||||||
const auto& expected = reply_action->expected_packets();
|
const auto& expected = reply_action->expected_packets();
|
||||||
|
|
||||||
size_t buffers_size = std::distance(
|
size_t buffers_size = std::distance(
|
||||||
buffers.begin(), buffers.end()
|
asio::buffer_sequence_begin(buffers), asio::buffer_sequence_end(buffers)
|
||||||
);
|
);
|
||||||
BOOST_CHECK_EQUAL(buffers_size, expected.size());
|
BOOST_CHECK_EQUAL(buffers_size, expected.size());
|
||||||
|
|
||||||
size_t num_packets = std::min(buffers_size, expected.size());
|
size_t num_packets = std::min(buffers_size, expected.size());
|
||||||
auto it = buffers.begin();
|
auto it = asio::buffer_sequence_begin(buffers);
|
||||||
for (size_t i = 0; i < num_packets; ++i, ++it) {
|
for (size_t i = 0; i < num_packets; ++i, ++it) {
|
||||||
BOOST_CHECK_EQUAL(it->size(), expected[i].size());
|
BOOST_CHECK_EQUAL(it->size(), expected[i].size());
|
||||||
size_t len = std::min(it->size(), expected[i].size());
|
size_t len = std::min(it->size(), expected[i].size());
|
||||||
|
Reference in New Issue
Block a user