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 | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/msg.cpp b/src/msg.cpp
index e8c6d26..3546424 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -16,20 +16,39 @@
* =====================================================================================
*/
#include "msg.h"
+#include "bh_util.h"
+#include "defs.h"
+#include "shm_socket.h"
-namespace bhome_shm {
-
-
-bool MsgMetaV1::Parse(const void *p)
+namespace bhome_msg
{
- assert(p);
- *this = *static_cast<const MsgMetaV1*>(p);
- return tag_ == kMsgMetaTag;
+
+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;
}
-void MsgMetaV1::Pack(void *p)
+void ShmMsg::Free()
{
- *static_cast<MsgMetaV1*>(p) = *this;
+ assert(valid());
+ shm().Dealloc(meta());
+ offset_ = 0;
+ assert(!valid());
}
-
-} // namespace bhome_shm
+} // namespace bhome_msg
--
Gitblit v1.8.0