From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.
---
src/shm_queue.cpp | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 8e4e56e..78fdaec 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -69,21 +69,34 @@
return Super::Remove(shm, MsgQIdToName(id));
}
+ShmMsgQueue::Queue *ShmMsgQueue::FindRemote(SharedMemory &shm, const MQId &remote_id)
+{
+ 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));
+ Queue *remote = FindRemote(shm, remote_id);
if (remote) {
- return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ 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::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
+
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend)
{
- Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ Queue *remote = FindRemote(shm, remote_id);
if (remote) {
- return remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
+ 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;
@@ -94,15 +107,5 @@
// 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::Recv(MsgI &imsg, BHMsgHead &head, const int timeout_ms)
-// {
-// if (Read(imsg, timeout_ms)) {
-// // DEFER1(imsg.Release(shm()););
-// return imsg.ParseHead(head);
-// } else {
-// return false;
-// }
-// }
} // namespace bhome_shm
--
Gitblit v1.8.0