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 +++++++++++-------------
src/interface_bus_api.cpp | 11 +++++++++--
src/bn_api.cpp | 15 ++++++++++-----
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index 39866a8..3ecf961 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -116,8 +116,10 @@
// printf("======>> BHRegisterTopics topic %s\n", mtl.topic_list(i).c_str());
mtl2.add_topic_list(mtl.topic_list(i));
}
+ std::move(mtl);
string msg(mtl2.SerializeAsString());
+ std::move(mtl2);
auto ret = simple_request(url, msg.data(), msg.size(), reply, reply_len, timeout_ms);
// printf("======>> BHRegisterTopics return value %d msg size %lu\n", ret, msg.size());
@@ -133,7 +135,7 @@
{
if (!topic || topic_len <= 0) return false;
- auto url(get_url(URLQueryTopic));
+ const auto& url = get_url(URLQueryTopic);
if (url.empty()) {
set_last_error("BHQueryTopicAddress url empty");
return false;
@@ -162,7 +164,7 @@
{
// if (!query || query_len <= 0) return false;
- auto url(get_url(URLQueryProcs));
+ const auto& url = get_url(URLQueryProcs);
if (url.empty()) {
set_last_error("BHQueryProcs url empty");
return false;
@@ -204,6 +206,8 @@
newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
string msg(newPub.SerializeAsString());
+ std::move(newPub);
+
if (pub.topic().empty()) {
set_last_error("BHPublish topic empty");
return false;
@@ -231,6 +235,7 @@
// printf("BHSubscribeTopics %s\n", t.c_str());
subscribe_topic(t);
}
+ std::move(mtl);
auto ret = simple_request(url, topics, topics_len, reply, reply_len, timeout_ms);
if (!ret){
@@ -307,8 +312,10 @@
bhome_msg::MsgQueryTopic msg;
msg.set_topic(req.topic());
+ std::move(req);
string s(msg.SerializeAsString());
+ std::move(msg);
void* reply2;
int reply_len2;
@@ -316,7 +323,6 @@
int ret = BHQueryTopicAddress(remote.c_str(), remote.length(), s.data(), s.size(),
&reply2, &reply_len2, timeout_ms);
if (!ret) return false;
-
bhome_msg::MsgQueryTopicReply mr;
if (!mr.ParseFromArray(reply2, reply_len2)){
@@ -329,9 +335,8 @@
}
auto& node_addr = mr.node_address(0);
- auto& procid = node_addr.proc_id();
+ *proc_id = node_addr.proc_id();
- *proc_id = procid;
return true;
}
diff --git a/src/interface_bus_api.cpp b/src/interface_bus_api.cpp
index ccb75c8..9d110c7 100644
--- a/src/interface_bus_api.cpp
+++ b/src/interface_bus_api.cpp
@@ -31,6 +31,7 @@
bus *b = new bus;
bhome_msg::ProcInfo pi;
if (pi.ParseFromArray(proc_info, proc_info_len)) get<8>(*b) = pi.proc_id();
+ std::move(pi);
const auto& url_hb = get_url(URLHeartBeat);
respond_survey(url_hb,string{(char*)proc_info,(size_t)proc_info_len},&get<5>(*b));
@@ -106,8 +107,11 @@
for(int i = 0; i < mtl.topic_list_size(); i++){
mtl2.add_topic_list(mtl.topic_list(i));
}
+ std::move(mtl);
string msg(mtl2.SerializeAsString());
+ std::move(mtl2);
+
const auto& url = get_url(URLRegTopic);
if (url.empty()) {
set_last_error("bus_register_topics url empty");
@@ -135,7 +139,7 @@
return false;
}
- auto url(get_url(URLQueryTopic));
+ const auto& url = get_url(URLQueryTopic);
if (url.empty()) {
set_last_error("bus_query_topic_address url empty");
return false;
@@ -173,7 +177,7 @@
return false;
}
- auto url(get_url(URLQueryProcs));
+ const auto& url = get_url(URLQueryProcs);
if (url.empty()) {
set_last_error("bus_query_procs url empty");
return false;
@@ -221,6 +225,7 @@
for(int i = 0; i < mtl.topic_list_size(); i ++){
subscribe_topic(mtl.topic_list(i), &get<2>(*b));
}
+ std::move(mtl);
///////////////////////////////////////////////////
auto ret = simple_request(url, topics, topics_len, reply, reply_len, timeout_ms);
@@ -283,6 +288,8 @@
newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
string msg(newPub.SerializeAsString());
+ std::move(newPub);
+
auto ret = publish(pub.topic(), msg.data(), msg.size(), &get<1>(*b));
if (ret > 0) return true;
return false;
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