From 34cd75f77d0ca94dbdba4e6cc9451fe4d33e78b3 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 19:14:13 +0800
Subject: [PATCH] add api BHQueryProcs.
---
src/shm_msg_queue.cpp | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index bc5075f..1d78e8c 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -33,17 +33,17 @@
ShmMsgQueue::MQId ShmMsgQueue::NewId()
{
- static auto &id = GetData();
+ static auto &id = GetData("Must init shared memory before use! Please make sure center is running.");
return (++id) * 10;
}
-ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) :
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, const int len) :
id_(id),
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) :
+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())
{
@@ -51,11 +51,15 @@
throw("error create/find msgq " + std::to_string(id_));
}
}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), true, segment, len) {}
+ShmMsgQueue::ShmMsgQueue(const int64_t abs_addr, ShmType &segment, const MQId id) :
+ id_(id), queue_(abs_addr, segment, MsgQIdToName(id_))
+{
+ //TODO check some tag.
+}
ShmMsgQueue::~ShmMsgQueue() {}
+#ifndef BH_USE_ATOMIC_Q
ShmMsgQueue::Mutex &ShmMsgQueue::GetMutex(const MQId id)
{
static std::unordered_map<MQId, std::shared_ptr<Mutex>> imm;
@@ -65,16 +69,23 @@
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)
{
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).Release();
+ }
}
}
return Shmq::Remove(shm, MsgQIdToName(id));
@@ -85,19 +96,19 @@
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)
{
- bool r = false;
try {
- ShmMsgQueue dest(remote_id, false, shm, 1);
- msg.AddRef();
- DEFER1(if (!r) { msg.Release(); });
-
+ //TODO find from center, or use offset.
+ ShmMsgQueue dest(remote.offset_, shm, remote.id_);
+#ifndef BH_USE_ATOMIC_Q
Guard lock(GetMutex(remote_id));
- r = dest.queue().TryWrite(msg.Offset());
+#endif
+ return dest.queue().TryWrite(val);
} catch (...) {
+ // SetLastError(eNotFound, "remote not found");
+ return false;
}
- return r;
}
// Test shows that in the 2 cases:
--
Gitblit v1.8.0