From 28f06bc49a4d8d69f1ea2f767863b7921d12f155 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期六, 08 五月 2021 18:30:48 +0800
Subject: [PATCH] add robust FMutex, works fine; use boost circular.
---
src/shm_msg_queue.cpp | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index 17558de..bc5075f 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -39,13 +39,13 @@
ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) :
id_(id),
- queue_(segment, MsgQIdToName(id_)) //, AdjustMQLength(len), segment.get_segment_manager())
+ queue_(segment, MsgQIdToName(id_), len, segment.get_segment_manager())
{
}
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_))
+ 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_));
@@ -56,6 +56,18 @@
ShmMsgQueue::~ShmMsgQueue() {}
+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;
+ }
+ return *pos->second;
+}
bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
{
Queue *q = Find(shm, id);
@@ -75,14 +87,15 @@
bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg)
{
- Queue *remote = Find(shm, remote_id);
bool r = false;
- if (remote) {
+ try {
+ ShmMsgQueue dest(remote_id, false, shm, 1);
msg.AddRef();
- r = remote->TryWrite(msg.Offset());
- if (!r) {
- msg.Release();
- }
+ DEFER1(if (!r) { msg.Release(); });
+
+ Guard lock(GetMutex(remote_id));
+ r = dest.queue().TryWrite(msg.Offset());
+ } catch (...) {
}
return r;
}
--
Gitblit v1.8.0