Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/AMSlib/wf/basedb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -959,10 +959,10 @@ class AMSMessage
*/
class AMSMessageRecords
{
private:
using record_t = std::pair<std::shared_ptr<uint8_t>, size_t>;
using iterator_t = std::unordered_map<int, record_t>::iterator;

private:
/** @brief Internal data structure that keeps messages nack */
std::unordered_map<int, record_t> _msgs;
/** @brief Shared mutex to ensure thread-safe access */
Expand All @@ -977,6 +977,22 @@ class AMSMessageRecords
AMSMessageRecords(AMSMessageRecords&&) = delete;
AMSMessageRecords& operator=(AMSMessageRecords&&) = delete;

/**
* @brief Custom destructor for our shared_ptr
*/
struct AMSMessageDeleter
{
void operator()(void* x) {
DBG(AMSMessageDeleter, "Freeing %p", x)
free(x);
x = nullptr;
}
};

static AMSMessageDeleter getDeleter() {
return AMSMessageDeleter();
}

/**
* @brief Return an iterator at the beggining of the records
*/
Expand Down Expand Up @@ -1715,7 +1731,7 @@ class RMQInterface

if (!_publisher->connectionValid()) restartPublisher();

std::shared_ptr<uint8_t> ptr(msg.data());
std::shared_ptr<uint8_t> ptr(msg.data(), AMSMessageRecords::getDeleter());
auto record = std::make_pair(std::move(ptr), msg.size());

// if we have some messages to send first (from a potential restart)
Expand Down