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, 18 insertions(+), 35 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index cd8cd66..e6aceb9 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -31,26 +31,13 @@
} // namespace
-ShmMsgQueue::MQId ShmMsgQueue::NewId()
-{
- static auto &id = GetData();
- return ++id;
-}
-// ShmMsgQueue memory usage: (320 + 16*length) bytes, length >= 2
-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_)) //, AdjustMQLength(len), segment.get_segment_manager())
+ queue_(segment, MsgQIdToName(id_), mode)
{
}
-
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- id_(NewId()),
- queue_(segment, true, MsgQIdToName(id_)) //, AdjustMQLength(len), segment.get_segment_manager())
-{
- if (!queue_.IsOk()) {
- throw("error create msgq " + std::to_string(id_));
- }
-}
+ShmMsgQueue::ShmMsgQueue(const int64_t abs_addr, ShmType &segment, const MQId id) :
+ id_(id), queue_(abs_addr, segment, MsgQIdToName(id_)) {}
ShmMsgQueue::~ShmMsgQueue() {}
@@ -58,9 +45,13 @@
{
Queue *q = Find(shm, id);
if (q) {
- MsgI msg;
- while (q->TryRead(msg.OffsetRef())) {
- msg.Release();
+ RawData val = 0;
+ while (q->TryRead(val)) {
+ if (IsCmd(val)) {
+ LOG_DEBUG() << "clsing queue " << id << ", has a cmd" << DecodeCmd(val);
+ } else {
+ MsgI(val, shm).Release();
+ }
}
}
return Shmq::Remove(shm, MsgQIdToName(id));
@@ -71,21 +62,13 @@
return Shmq::Find(shm, MsgQIdToName(remote_id));
}
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg)
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQInfo &remote, const RawData val)
{
- Queue *remote = Find(shm, remote_id);
- bool r = false;
- if (remote) {
- msg.AddRef();
- r = remote->TryWrite(msg.Offset());
- if (!r) {
- msg.Release();
- }
+ try {
+ ShmMsgQueue dest(remote.offset_, shm, remote.id_);
+ return dest.queue().TryWrite(val);
+ } catch (...) {
+ // SetLastError(eNotFound, "remote not found");
+ return false;
}
- return r;
}
-
-// 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