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/shm_msg_queue.cpp |   53 +++++++----------------------------------------------
 1 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index d96c511..e6aceb9 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -31,46 +31,15 @@
 
 } // namespace
 
-ShmMsgQueue::MQId ShmMsgQueue::NewId()
-{
-	static auto &id = GetData();
-	return (++id) * 10;
-}
-
-ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) :
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, Mode mode) :
     id_(id),
-    queue_(segment, MsgQIdToName(id_), len, segment.get_segment_manager())
+    queue_(segment, MsgQIdToName(id_), mode)
 {
 }
-
-ShmMsgQueue::ShmMsgQueue(const MQId id, const bool create_or_else_find, ShmType &segment, const int len) :
-    id_(id),
-    queue_(segment, create_or_else_find, MsgQIdToName(id_), len, segment.get_segment_manager())
-{
-	if (!queue_.IsOk()) {
-		throw("error create/find msgq " + std::to_string(id_));
-	}
-}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
-    ShmMsgQueue(NewId(), true, segment, len) {}
+ShmMsgQueue::ShmMsgQueue(const int64_t abs_addr, ShmType &segment, const MQId id) :
+    id_(id), queue_(abs_addr, segment, MsgQIdToName(id_)) {}
 
 ShmMsgQueue::~ShmMsgQueue() {}
-
-#ifndef BH_USE_ATOMIC_Q
-ShmMsgQueue::Mutex &ShmMsgQueue::GetMutex(const MQId id)
-{
-	static std::unordered_map<MQId, std::shared_ptr<Mutex>> imm;
-
-	static std::mutex mtx;
-	std::lock_guard<std::mutex> lock(mtx);
-	auto pos = imm.find(id);
-	if (pos == imm.end()) {
-		pos = imm.emplace(id, new Mutex(id)).first;
-		// pos = imm.emplace(id, new Mutex()).first;
-	}
-	return *pos->second;
-}
-#endif
 
 bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
 {
@@ -81,7 +50,7 @@
 			if (IsCmd(val)) {
 				LOG_DEBUG() << "clsing queue " << id << ", has a cmd" << DecodeCmd(val);
 			} else {
-				MsgI(val).Release();
+				MsgI(val, shm).Release();
 			}
 		}
 	}
@@ -93,21 +62,13 @@
 	return Shmq::Find(shm, MsgQIdToName(remote_id));
 }
 
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, int64_t val)
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQInfo &remote, const RawData val)
 {
 	try {
-		ShmMsgQueue dest(remote_id, false, shm, 1);
-#ifndef BH_USE_ATOMIC_Q
-		Guard lock(GetMutex(remote_id));
-#endif
+		ShmMsgQueue dest(remote.offset_, shm, remote.id_);
 		return dest.queue().TryWrite(val);
 	} catch (...) {
 		// SetLastError(eNotFound, "remote not found");
 		return false;
 	}
 }
-
-// Test shows that in the 2 cases:
-// 1) build msg first, then find remote queue;
-// 2) find remote queue first, then build msg;
-// 1 is about 50% faster than 2, maybe cache related.

--
Gitblit v1.8.0