From 13c503b73b4ecc8ce4a6e344f9ac15202985d686 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 19:48:58 +0800
Subject: [PATCH] fix memory leak
---
src/msg.cpp | 145 +++++++++---------------------------------------
1 files changed, 28 insertions(+), 117 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index 78834a8..3546424 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -17,127 +17,38 @@
*/
#include "msg.h"
#include "bh_util.h"
+#include "defs.h"
+#include "shm_socket.h"
-namespace bhome_msg {
-
-const uint32_t kMsgTag = 0xf1e2d3c4;
-const uint32_t kMsgPrefixLen = 4;
-
-BHMsg InitMsg(MsgType type)
+namespace bhome_msg
{
- BHMsg msg;
- msg.set_type(type);
- time_t tm = 0;
- msg.set_timestamp(time(&tm));
- return msg;
+
+int ShmMsg::Release()
+{
+ if (!valid()) {
+ return 0;
+ }
+ auto n = meta()->count_.Dec();
+ if (n == 0) {
+ if (meta()->managed_) {
+ int64_t free_cmd = (id() << 4) | EncodeCmd(eCmdFree);
+ DefaultSender(shm()).Send(BHTopicCenterAddress(shm()), free_cmd);
+ } else {
+ Free();
+ }
+ } else if (n < 0) {
+ // ns_log::GetTrace();
+ LOG_FATAL() << "double release msg.";
+ throw std::runtime_error("double release msg.");
+ }
+ return n;
}
-BHMsg MakeRequest(const MQId &src_id, const void *data, const size_t size)
+void ShmMsg::Free()
{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypeRequest));
- msg.set_body(data, size);
- msg.add_route()->set_mq_id(&src_id, sizeof(src_id));
- return msg;
+ assert(valid());
+ shm().Dealloc(meta());
+ offset_ = 0;
+ assert(!valid());
}
-
-BHMsg MakeReply(const void *data, const size_t size)
-{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypeReply));
- msg.set_body(data, size);
- return msg;
-}
-
-BHMsg MakeSubUnsub(const MQId &client, const std::vector<std::string> &topics, const MsgType sub_unsub)
-{
- assert(sub_unsub == kMsgTypeSubscribe || sub_unsub == kMsgTypeUnsubscribe);
- BHMsg msg(InitMsg(sub_unsub));
- msg.add_route()->set_mq_id(&client, sizeof(client));
- DataSub subs;
- for (auto &t : topics) {
- subs.add_topics(t);
- }
- msg.set_body(subs.SerializeAsString());
- return msg;
-}
-
-BHMsg MakeSub(const MQId &client, const std::vector<std::string> &topics) { return MakeSubUnsub(client, topics, kMsgTypeSubscribe); }
-BHMsg MakeUnsub(const MQId &client, const std::vector<std::string> &topics) { return MakeSubUnsub(client, topics, kMsgTypeUnsubscribe); }
-
-BHMsg MakePub(const std::string &topic, const void *data, const size_t size)
-{
- assert(data && size);
- BHMsg msg(InitMsg(kMsgTypePublish));
- DataPub pub;
- pub.set_topic(topic);
- pub.set_data(data, size);
- msg.set_body(pub.SerializeAsString());
- return msg;
-}
-
-void *Pack(SharedMemory &shm, const BHMsg &msg)
-{
- uint32_t msg_size = msg.ByteSizeLong();
- void *p = shm.Alloc(4 + msg_size);
- if(p) {
- Put32(p, msg_size);
- if (!msg.SerializeToArray(static_cast<char*>(p) + kMsgPrefixLen, msg_size)) {
- shm.Dealloc(p);
- p = 0;
- }
- }
- return p;
-}
-
-bool MsgI::Unpack(BHMsg &msg) const
-{
- void *p = ptr_.get();
- assert(p);
- uint32_t msg_size = Get32(p);
- return msg.ParseFromArray(static_cast<char*>(p) + kMsgPrefixLen, msg_size);
-}
-
-// with ref count;
-bool MsgI::MakeRC(SharedMemory &shm, const BHMsg &msg)
-{
- void *p = Pack(shm, msg);
- if(!p) {
- return false;
- }
- RefCount *rc = shm.New<RefCount>();
- if (!rc) {
- shm.Dealloc(p);
- return false;
- }
- MsgI(p, rc).swap(*this);
- return true;
-}
-
-bool MsgI::Make(SharedMemory &shm, const BHMsg &msg)
-{
- void *p = Pack(shm, msg);
- if(!p) {
- return false;
- }
- MsgI(p, 0).swap(*this);
- return true;
-}
-
-int MsgI::Release(SharedMemory &shm)
-{
- if (IsCounted()) {
- const int n = count_->Dec();
- if (n != 0) {
- return n;
- }
- }
- // free data
- shm.Dealloc(ptr_);
- ptr_ = 0;
- shm.Delete(count_);
- count_ = 0;
- return 0;
-}
-
} // namespace bhome_msg
--
Gitblit v1.8.0