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/defs.cpp | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/defs.cpp b/src/defs.cpp
index 9402b27..8ebcc7d 100644
--- a/src/defs.cpp
+++ b/src/defs.cpp
@@ -123,29 +123,28 @@
return shm;
}
-} // namespace
-
-CenterInfo *GetCenterInfo(SharedMemory &shm)
-{
- auto pmeta = Ptr<CenterMetaInfo>(kCenterInfoFixedAddress + Addr(shm.get_address()));
- if (pmeta->tag_ == kMetaInfoTag) {
- return &pmeta->info_;
- }
- return nullptr;
-}
-
-ShmSocket &DefaultSender(SharedMemory &shm)
+ShmSocket &ShmSender(SharedMemory &shm, const bool reset)
{
typedef std::pair<void *, std::shared_ptr<ShmSocket>> Pair;
static std::vector<Pair> store;
static std::mutex s_mtx;
-
thread_local Pair local_cache;
- if (local_cache.first == &shm) {
+
+ std::lock_guard<std::mutex> lk(s_mtx);
+
+ if (reset) {
+ for (auto &kv : store) {
+ if (kv.first == &shm) {
+ auto &mq = GetCenterInfo(shm)->mq_sender_;
+ kv.second.reset(new ShmSocket(mq.offset_, shm, mq.id_));
+ local_cache = kv;
+ return *local_cache.second;
+ }
+ }
+ } else if (local_cache.first == &shm) {
return *local_cache.second;
}
- std::lock_guard<std::mutex> lk(s_mtx);
for (auto &kv : store) {
if (kv.first == &shm) {
local_cache = kv;
@@ -157,6 +156,18 @@
local_cache = store.back();
return *local_cache.second;
}
+} // namespace
+
+CenterInfo *GetCenterInfo(SharedMemory &shm)
+{
+ auto pmeta = Ptr<CenterMetaInfo>(kCenterInfoFixedAddress + Addr(shm.get_address()));
+ if (pmeta->tag_ == kMetaInfoTag) {
+ return &pmeta->info_;
+ }
+ return nullptr;
+}
+
+ShmSocket &DefaultSender(SharedMemory &shm) { return ShmSender(shm, false); }
BHomeMetaInfo *GetBHomeMeta()
{
@@ -266,13 +277,21 @@
std::string BHomeShmName()
{
auto bhome_meta = Ptr<BHomeMetaInfo>(kShmMetaInfoFixedAddress + Addr(BHomeMetaShm().get_address()));
- return "bhome_shmq_id_" + std::to_string(bhome_meta->shm_id_.load());
+ return "bhshmq_sid_" + std::to_string(bhome_meta->shm_id_.load());
}
SharedMemory &BHomeShm()
{
- static SharedMemory shm(BHomeShmName(), 1024 * 1024 * 512);
- return shm;
+ static std::unique_ptr<SharedMemory> shm_ptr;
+ static std::string shm_name;
+ if (!shm_ptr || shm_name != BHomeShmName()) {
+ shm_name = BHomeShmName();
+ if (shm_ptr) {
+ ShmSender(*shm_ptr, true); // reset sender.
+ }
+ shm_ptr.reset(new SharedMemory(shm_name, 1024 * 1024 * 512));
+ }
+ return *shm_ptr;
}
bool GlobalInit(SharedMemory &shm) { return GetCenterInfo(shm); }
--
Gitblit v1.8.0