boostorg/mqtt5
1
0
Fork 1
mirror of https://github.com/boostorg/mqtt5.git synced 2025-08-01 05:24:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

[mqtt-client] pids start from 1

Browse Source 
Summary: remove flat_map dependency

Reviewers: ivica

Reviewed By: ivica

Subscribers: korina

Differential Revision: https://repo.mireo.local/D26336
This commit is contained in:
Bruno Iljazovic
2023-10-30 15:40:14 +01:00
parent 15a3d62727
commit 10556a3dda
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/async_mqtt5/detail/control_packet.hpp
View File

@@ -2,8 +2,8 @@
#define ASYNC_MQTT5_CONTROL_PACKET_HPP #define ASYNC_MQTT5_CONTROL_PACKET_HPP
#include <mutex> #include <mutex>
#include <vector>
#include <boost/container/flat_map.hpp>
#include <boost/smart_ptr/allocate_unique.hpp> #include <boost/smart_ptr/allocate_unique.hpp>
#include <async_mqtt5/types.hpp> #include <async_mqtt5/types.hpp>
@@ -107,43 +107,57 @@ public:
}; };
class packet_id_allocator { class packet_id_allocator {
struct interval {
uint16_t start, end;
interval(uint16_t start, uint16_t end) : start(start), end(end) {}
};
std::mutex _mtx; std::mutex _mtx;
boost::container::flat_map<uint16_t,uint16_t> _free_ids; std::vector<interval> _free_ids;
static constexpr uint16_t MAX_PACKET_ID = 65535; static constexpr uint16_t MAX_PACKET_ID = 65535;
public: public:
packet_id_allocator() { packet_id_allocator() {
_free_ids.emplace(1, MAX_PACKET_ID); _free_ids.emplace_back(MAX_PACKET_ID, 0);
} }
uint16_t allocate() { uint16_t allocate() {
std::lock_guard _(_mtx); std::lock_guard _(_mtx);
if (_free_ids.empty()) return 0; if (_free_ids.empty()) return 0;
auto it = std::prev(_free_ids.end()); auto& last = _free_ids.back();
auto ret = it->second; if (last.start == ++last.end) {
if (it->first > --it->second) auto ret = last.end;
_free_ids.erase(it); _free_ids.pop_back();
return ret; return ret;
}
return last.end;
} }
void free(uint16_t pid) { void free(uint16_t pid) {
std::lock_guard _(_mtx); std::lock_guard _(_mtx);
auto it = _free_ids.upper_bound(pid); auto it = std::upper_bound(
_free_ids.begin(), _free_ids.end(), pid,
[](const uint16_t x, const interval& i) { return x > i.start; }
);
uint16_t* end_p = nullptr; uint16_t* end_p = nullptr;
if (it != _free_ids.begin()) { if (it != _free_ids.begin()) {
auto pit = std::prev(it); auto pit = std::prev(it);
if (pit->second + 1 == pid) if (pit->end == pid)
end_p = &pit->second; end_p = &pit->end;
} }
auto end_v = pid; if (it != _free_ids.end() && pid - 1 == it->start) {
if (it != _free_ids.end() && pid + 1 == it->first) { if (!end_p)
end_v = it->second; it->start = pid;
_free_ids.erase(it); else {
*end_p = it->end;
_free_ids.erase(it);
}
} else {
if (!end_p)
_free_ids.insert(it, interval(pid, pid - 1));
else
*end_p = pid - 1;
} }
if (!end_p)
_free_ids.emplace(pid, end_v);
else
*end_p = end_v;
} }
}; };

8
test/unit/test/client_broker.cpp
View File

@@ -87,16 +87,16 @@ BOOST_AUTO_TEST_CASE(two_publishes_qos_1_with_fail_on_write) {
false, reason_codes::success.value(), {} false, reason_codes::success.value(), {}
); );
auto publish_1 = encoders::encode_publish( auto publish_1 = encoders::encode_publish(
65535, "t", "p_1", qos_e::at_least_once, retain_e::no, dup_e::no, {} 1, "t", "p_1", qos_e::at_least_once, retain_e::no, dup_e::no, {}
); );
auto puback_1 = encoders::encode_puback( auto puback_1 = encoders::encode_puback(
65535, reason_codes::success.value(), {} 1, reason_codes::success.value(), {}
); );
auto publish_2 = encoders::encode_publish( auto publish_2 = encoders::encode_publish(
65534, "t", "p_2", qos_e::at_least_once, retain_e::no, dup_e::no, {} 2, "t", "p_2", qos_e::at_least_once, retain_e::no, dup_e::no, {}
); );
auto puback_2 = encoders::encode_puback( auto puback_2 = encoders::encode_puback(
65534, reason_codes::success.value(), {} 2, reason_codes::success.value(), {}
); );
test::msg_exchange broker_side; test::msg_exchange broker_side;