From 02ba913dc7bb5d711471b27f2ea23a897d0f2e28 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 15:34:26 +0800
Subject: [PATCH] bind msgi to shm, change offset_ptr to abs offset.
---
src/shm_queue.cpp | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index f2fb45b..df9ce1f 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -55,48 +55,52 @@
}
ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), segment, len)
+ ShmMsgQueue(NewId(), segment, len) {}
+
+ShmMsgQueue::~ShmMsgQueue() {}
+
+bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId &id)
{
+ return Super::Remove(shm, MsgQIdToName(id));
}
-ShmMsgQueue::~ShmMsgQueue()
+ShmMsgQueue::Queue *ShmMsgQueue::FindRemote(SharedMemory &shm, const MQId &remote_id)
{
- Remove();
+ return Find(shm, MsgQIdToName(remote_id));
}
-
bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend)
{
- Queue *remote = Find(shm, MsgQIdToName(remote_id));
- return remote && remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ Queue *remote = FindRemote(shm, remote_id);
+ if (remote) {
+ if (onsend) {
+ return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ } else {
+ return remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
+ }
+ } else {
+ // SetLestError(eNotFound);
+ return false;
+ }
+}
+
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend)
+{
+ Queue *remote = FindRemote(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;
+ }
}
// 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.
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const BHMsg &data, const int timeout_ms, const std::function<void()> &onsend)
-{
- MsgI msg;
- if (msg.Make(shm(), data)) {
- if (Send(remote_id, msg, timeout_ms, onsend)) {
- return true;
- } else {
- msg.Release(shm());
- }
- }
- return false;
-}
-
-bool ShmMsgQueue::Recv(BHMsg &msg, const int timeout_ms)
-{
- MsgI imsg;
- if (Read(imsg, timeout_ms)) {
- DEFER1(imsg.Release(shm()););
- return imsg.Unpack(msg);
- } else {
- return false;
- }
-}
} // namespace bhome_shm
--
Gitblit v1.8.0