boostorg/mqtt5
1
0
Fork 1
mirror of https://github.com/boostorg/mqtt5.git synced 2025-07-30 04:27:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for immediate executors

Browse Source 
Summary: related to T13767

Reviewers: ivica

Reviewed By: ivica

Subscribers: iljazovic, miljen

Differential Revision: https://repo.mireo.local/D30809
This commit is contained in:
Korina Šimičević
2024-08-06 12:54:15 +02:00
parent 7bc1ccf072
commit b55ec679bf
7 changed files with 225 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/include/test_common/test_stream.hpp
View File

@ -8,6 +8,7 @@
#ifndef ASYNC_MQTT5_TEST_TEST_STREAM_HPP
#define ASYNC_MQTT5_TEST_TEST_STREAM_HPP
#include <boost/asio/associated_executor.hpp>
#include <boost/asio/dispatch.hpp>
#include <boost/asio/execution_context.hpp>
#include <boost/asio/post.hpp>
@ -48,7 +49,13 @@ private:
friend class write_op;
public:
test_stream_impl(executor_type ex) : _ex(std::move(ex)) {}
explicit test_stream_impl(executor_type ex) : _ex(std::move(ex)) {}
test_stream_impl(test_stream_impl&&) = default;
test_stream_impl(const test_stream_impl&) = delete;
test_stream_impl& operator=(test_stream_impl&&) = default;
test_stream_impl& operator=(const test_stream_impl&) = delete;
executor_type get_executor() const noexcept {
return _ex;
@ -128,20 +135,23 @@ public:
read_op(read_op&&) = default;
read_op(const read_op&) = delete;
using executor_type = test_stream_impl::executor_type;
executor_type get_executor() const noexcept {
return _stream_impl->get_executor();
}
read_op& operator=(read_op&&) noexcept = default;
read_op& operator=(const read_op&) = delete;
using allocator_type = asio::recycling_allocator<void>;
allocator_type get_allocator() const noexcept {
return allocator_type {};
}
using executor_type = test_stream_impl::executor_type;
executor_type get_executor() const noexcept {
return _stream_impl->get_executor();
}
template <typename BufferType>
void perform(const BufferType& buffer) {
if (!_stream_impl->is_open() || !_stream_impl->is_connected())
return complete_post(asio::error::not_connected, 0);
return complete_immediate(asio::error::not_connected, 0);
_stream_impl->_test_broker->read_from_network(
buffer,
@ -156,8 +166,8 @@ public:
}
private:
void complete_post(error_code ec, size_t bytes_read) {
_handler.complete_post(ec, bytes_read);
void complete_immediate(error_code ec, size_t bytes_read) {
_handler.complete_immediate(ec, bytes_read);
}
void complete(error_code ec, size_t bytes_read) {
@ -183,16 +193,19 @@ public:
write_op(write_op&&) = default;
write_op(const write_op&) = delete;
using executor_type = test_stream_impl::executor_type;
executor_type get_executor() const noexcept {
return _stream_impl->get_executor();
}
write_op& operator=(write_op&&) noexcept = default;
write_op& operator=(const write_op&) = delete;
using allocator_type = asio::recycling_allocator<void>;
allocator_type get_allocator() const noexcept {
return allocator_type {};
}
using executor_type = test_stream_impl::executor_type;
executor_type get_executor() const noexcept {
return _stream_impl->get_executor();
}
template <typename BufferType>
void perform(const BufferType& buffers) {
if (!_stream_impl->is_open() || !_stream_impl->is_connected())

138
test/integration/executors.cpp
View File

@ -10,9 +10,13 @@
#include <chrono>
#include <boost/asio/io_context.hpp>
#include <boost/asio/bind_executor.hpp>
#include <boost/asio/bind_immediate_executor.hpp>
#include <boost/asio/strand.hpp>
#include <boost/asio/steady_timer.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <async_mqtt5/impl/codecs/message_encoders.hpp>
#include <async_mqtt5.hpp>
@ -101,8 +105,8 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec) {
BOOST_CHECK_EQUAL(ec, asio::error::operation_aborted);
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(ec == asio::error::operation_aborted);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -113,8 +117,8 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -125,9 +129,9 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec, reason_code rc, auto) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK_MESSAGE(!rc, rc.message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(!rc);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -138,9 +142,9 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec, reason_code rc, auto) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK_MESSAGE(!rc, rc.message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(!rc);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -151,9 +155,9 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec, std::vector<reason_code> rcs, auto) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK_MESSAGE(!rcs[0], rcs[0].message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(!rcs[0]);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -167,10 +171,10 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
std::string rec_topic, std::string rec_payload,
publish_props
) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK_EQUAL("t_0", rec_topic);
BOOST_CHECK_EQUAL("p_0", rec_payload);
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST("t_0" == rec_topic);
BOOST_TEST("p_0" == rec_payload);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
c.async_unsubscribe(
@ -178,17 +182,17 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
asio::bind_executor(
strand,
[&](error_code ec, std::vector<reason_code> rcs, auto) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK_MESSAGE(!rcs[0], rcs[0].message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(!rcs[0]);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
c.async_disconnect(
asio::bind_executor(
strand,
[&](error_code ec) {
BOOST_CHECK_MESSAGE(!ec, ec.message());
BOOST_CHECK(strand.running_in_this_thread());
BOOST_TEST(!ec);
BOOST_TEST(strand.running_in_this_thread());
++handlers_called;
}
)
@ -201,8 +205,94 @@ BOOST_AUTO_TEST_CASE(bind_executor) {
);
ioc.run_for(500ms);
BOOST_CHECK_EQUAL(handlers_called, expected_handlers_called);
BOOST_CHECK(broker.received_all_expected());
BOOST_TEST(handlers_called == expected_handlers_called);
BOOST_TEST(broker.received_all_expected());
}
BOOST_AUTO_TEST_CASE(immediate_executor_async_publish) {
constexpr int expected_handlers_called = 1;
int handlers_called = 0;
asio::io_context ioc;
using client_type = mqtt_client<asio::ip::tcp::socket>;
client_type c(ioc.get_executor());
auto strand = asio::make_strand(ioc);
auto handler = asio::bind_immediate_executor(
strand,
[&handlers_called, &strand](error_code ec) {
++handlers_called;
BOOST_TEST(strand.running_in_this_thread());
BOOST_TEST(ec);
}
);
c.async_publish<qos_e::at_most_once>(
"invalid/#", "", retain_e::no, publish_props {}, std::move(handler)
);
ioc.run();
BOOST_TEST(handlers_called == expected_handlers_called);
}
BOOST_AUTO_TEST_CASE(immediate_executor_async_subscribe) {
constexpr int expected_handlers_called = 1;
int handlers_called = 0;
asio::io_context ioc;
using client_type = mqtt_client<asio::ip::tcp::socket>;
client_type c(ioc.get_executor());
auto strand = asio::make_strand(ioc);
auto handler = asio::bind_immediate_executor(
strand,
[&handlers_called, &strand](
error_code ec, std::vector<reason_code>, suback_props
) {
++handlers_called;
BOOST_TEST(strand.running_in_this_thread());
BOOST_TEST(ec);
}
);
c.async_subscribe(
{ "+topic" }, subscribe_props {}, std::move(handler)
);
ioc.run();
BOOST_TEST(handlers_called == expected_handlers_called);
}
BOOST_AUTO_TEST_CASE(immediate_executor_async_unsubscribe) {
constexpr int expected_handlers_called = 1;
int handlers_called = 0;
asio::io_context ioc;
using client_type = mqtt_client<asio::ip::tcp::socket>;
client_type c(ioc.get_executor());
auto strand = asio::make_strand(ioc);
auto handler = asio::bind_immediate_executor(
strand,
[&handlers_called, &strand](
error_code ec, std::vector<reason_code>, unsuback_props
) {
++handlers_called;
BOOST_TEST(strand.running_in_this_thread());
BOOST_TEST(ec);
}
);
c.async_unsubscribe(
"some/topic#", unsubscribe_props {}, std::move(handler)
);
ioc.run();
BOOST_TEST(handlers_called == expected_handlers_called);
}
BOOST_AUTO_TEST_SUITE_END()