From 2988d18a77dcdc58f6e7f1c16ffe5f62900bb15b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 14 十二月 2022 17:20:26 +0800
Subject: [PATCH] fixed memory leak
---
src/nng_wrap.cpp | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/nng_wrap.cpp b/src/nng_wrap.cpp
index 7b5559e..c2478ca 100644
--- a/src/nng_wrap.cpp
+++ b/src/nng_wrap.cpp
@@ -56,9 +56,7 @@
// simple interface
void free_nng(void* data, const int data_len){
- if (data){
- free(data);
- }
+ free(data);
}
void copy_memory(void** dest, int *dest_len, const void* src, const int src_len){
@@ -209,12 +207,12 @@
sub->socket_ = sock;
sub->t_ = get_thread([](const auto sub){
while (!sub->t_quit_.load()) {
- char* m;
+ char* m{};
int m_len = nn_recv(sub->socket_, &m, NN_MSG, NN_DONTWAIT);
if (m_len > 0){
string tmp_msg{m, (size_t)m_len};
nn_freemsg(m);
- const auto topic{tmp_msg.c_str()};
+ string topic{tmp_msg.c_str()};
string msg{};
{
lock_guard<mutex> l{sub->operator()()};
@@ -228,7 +226,7 @@
// printf("======>> subscribe recv topic %s msg length %lu\n", topic, msg.length());
if (!msg.empty()){
lock_guard<mutex> l(sub->mtx_msg_);
- sub->msg_.emplace_back(topic, move(msg));
+ sub->msg_.emplace_back(move(topic), move(msg));
sub->cv_msg_.notify_all();
}
@@ -309,9 +307,9 @@
PRNTVITAG("subscribe_read timeout");
return -1;
}
- const auto& tmp = sub->msg_.front();
- *topic = tmp.topic_;
- *msg = tmp.data_;
+ auto& tmp = sub->msg_.front();
+ *topic = std::move(tmp.topic_);
+ *msg = std::move(tmp.data_);
sub->msg_.pop_front();
return 0;
@@ -427,15 +425,14 @@
_rr* rep = (_rr*)w->user_data;
- string msg{(const char*)nng_msg_body(om), nng_msg_len(om)};
- nng_msg_free(om);
-
auto t = (*rep)();
lock_guard<mutex> l{rep->mtx_msg_};
rep->works_.emplace(get<0>(t), w);
- get<1>(t).emplace(get<0>(t), move(msg));
+ get<1>(t).emplace(get<0>(t), string{(const char*)nng_msg_body(om), nng_msg_len(om)});
get<0>(t)++;
rep->cv_msg_.notify_all();
+
+ nng_msg_free(om);
}
static struct work *alloc_work(nng_socket sock, _rr* rep, const int mode)
@@ -603,6 +600,7 @@
struct work* w{};
{
auto key = *(static_cast<uint64_t*>(const_cast<void*>(src)));
+ free(const_cast<void*>(src));
lock_guard<mutex> l{rep->mtx_msg_};
auto iter = rep->works_.find(key);
--
Gitblit v1.8.0