From d89ff0ad812cdf178b911843bc3e8c04b2f00845 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 03 六月 2021 10:29:51 +0800
Subject: [PATCH] center remove old shm on start.
---
src/shm_msg_queue.cpp | 45 +++------------------------------------------
1 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index 1d78e8c..056daec 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -31,25 +31,10 @@
} // namespace
-ShmMsgQueue::MQId ShmMsgQueue::NewId()
-{
- static auto &id = GetData("Must init shared memory before use! Please make sure center is running.");
- return (++id) * 10;
-}
-
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, 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(ShmType &segment, const bool create_or_else_find, const MQId id, 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(const int64_t abs_addr, ShmType &segment, const MQId id) :
id_(id), queue_(abs_addr, segment, MsgQIdToName(id_))
@@ -58,22 +43,6 @@
}
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)
{
@@ -84,7 +53,7 @@
if (IsCmd(val)) {
LOG_DEBUG() << "clsing queue " << id << ", has a cmd" << DecodeCmd(val);
} else {
- MsgI(val).Release();
+ MsgI(val, shm).Release();
}
}
}
@@ -101,17 +70,9 @@
try {
//TODO find from center, or use offset.
ShmMsgQueue dest(remote.offset_, shm, remote.id_);
-#ifndef BH_USE_ATOMIC_Q
- Guard lock(GetMutex(remote_id));
-#endif
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