From 1b52f1cb8c47dd2c0195d2fd65d7b6a4c2f10704 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 12 四月 2021 18:29:41 +0800
Subject: [PATCH] add fail-resend support.
---
src/shm_queue.cpp | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index de38229..652ed5b 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -60,15 +60,13 @@
}
ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), segment, len)
-{
-}
+ ShmMsgQueue(NewId(), segment, len) {}
-ShmMsgQueue::~ShmMsgQueue()
+ShmMsgQueue::~ShmMsgQueue() {}
+
+bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId &id)
{
- // It's not safe to remove, others may still holder pointers and write to it.
- // TODO use smart_ptr or garbage collection.
- //Remove();
+ return Super::Remove(shm, MsgQIdToName(id));
}
bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend)
@@ -76,34 +74,25 @@
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)
-{
- MsgI imsg;
- if (Read(imsg, timeout_ms)) {
- DEFER1(imsg.Release(shm()););
- return imsg.Unpack(msg);
- } else {
- return false;
- }
-}
+// 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