From 65ef4d68321e56906920be75831b5e968f7abd7b Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 13 四月 2021 09:34:05 +0800
Subject: [PATCH] add heartbeat; refactor.
---
src/shm_queue.cpp | 94 ++++++++++++++++++++---------------------------
1 files changed, 40 insertions(+), 54 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index cf4c8b4..8e4e56e 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -21,6 +21,11 @@
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
+// TODO !!! add garbage collection, and handshake with gc-center.
+// smart pointer will NOT work if user crash.
+// problem of process release mq: client query success; server exits; client send.
+// client query success; server exits; client send.
+
namespace bhome_shm
{
using namespace bhome_msg;
@@ -55,68 +60,49 @@
}
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()
-{
- Remove();
-}
-
-bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
+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, [](const MsgI &msg) { msg.AddRef(); });
-}
-
-// bool ShmMsgQueue::Send(const MQId &remote_id, const MsgI &msg, const int timeout_ms)
-// {
-// Queue *remote = Find(MsgQIdToName(remote_id));
-// return remote && remote->Write(msg, timeout_ms, [](const MsgI&msg){msg.AddRef();});
-// }
-
-bool ShmMsgQueue::Send(const MQId &remote_id, const BHMsg &data, const int timeout_ms)
-{
- MsgI msg;
- if (msg.Make(shm(), data)) {
- if (Send(remote_id, msg, timeout_ms)) {
- return true;
- } else {
- msg.Release(shm());
- }
- }
- return false;
-}
-
-/*
-bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
-{
- // 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.
-
- MsgI msg;
- if(msg.BuildRequest(shm(), Id(), data, size)) {
- if(Send(remote_id, msg, timeout_ms)) {
- 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);
+ if (remote) {
+ return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
} else {
+ // SetLestError(eNotFound);
return false;
}
}
+bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms)
+{
+ Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ if (remote) {
+ return remote->Write(msg, timeout_ms, [](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::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