From bb9a7e348892eb5c4fccb063380aa6fcd9612b71 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 06 四月 2021 17:32:35 +0800
Subject: [PATCH] server resend failed; rename msgs; refactor.
---
src/shm_queue.cpp | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index de38229..dcb5a9e 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -76,24 +76,16 @@
Queue *remote = Find(shm, MsgQIdToName(remote_id));
return remote && remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
}
+bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
+{
+ Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ return remote && remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
+}
// 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)
{
--
Gitblit v1.8.0