From 77a6c3512a44dfe6540dde71946e6484fe4f173f Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 10 五月 2021 16:05:28 +0800
Subject: [PATCH] test lock code.
---
src/shm_msg_queue.cpp | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index ae019bf..b78c1a0 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -29,50 +29,52 @@
return std::string(buf, n + 4);
}
-const int AdjustMQLength(const int len)
-{
- const int kMaxLength = 10000;
- const int kDefaultLen = 12;
- if (len <= 0) {
- return kDefaultLen;
- } else if (len < kMaxLength) {
- return len;
- } else {
- return kMaxLength;
- }
-}
-
} // namespace
ShmMsgQueue::MQId ShmMsgQueue::NewId()
{
static auto &id = GetData();
- return ++id;
+ return (++id) * 10;
}
-// ShmMsgQueue memory usage: (320 + 16*length) bytes, length >= 2
+
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(ShmType &segment, const int len) :
- id_(NewId()),
- queue_(segment, true, MsgQIdToName(id_), AdjustMQLength(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_), len, segment.get_segment_manager())
{
if (!queue_.IsOk()) {
- throw("error create msgq " + std::to_string(id_));
+ throw("error create/find msgq " + std::to_string(id_));
}
}
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
+ ShmMsgQueue(NewId(), true, segment, len) {}
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;
+ // pos = imm.emplace(id, new Mutex()).first;
+ }
+ return *pos->second;
+}
bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
{
Queue *q = Find(shm, id);
if (q) {
MsgI msg;
- while (q->TryRead(msg)) {
+ while (q->TryRead(msg.OffsetRef())) {
msg.Release();
}
}
@@ -84,19 +86,19 @@
return Shmq::Find(shm, MsgQIdToName(remote_id));
}
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend)
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg)
{
- Queue *remote = Find(shm, remote_id);
- if (remote) {
- if (onsend) {
- return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
- } else {
- return remote->TryWrite(msg, [](const MsgI &msg) { msg.AddRef(); });
- }
- } else {
- // SetLestError(eNotFound);
- return false;
+ bool r = false;
+ try {
+ ShmMsgQueue dest(remote_id, false, shm, 1);
+ msg.AddRef();
+ DEFER1(if (!r) { msg.Release(); });
+
+ Guard lock(GetMutex(remote_id));
+ r = dest.queue().TryWrite(msg.Offset());
+ } catch (...) {
}
+ return r;
}
// Test shows that in the 2 cases:
--
Gitblit v1.8.0