From 65a230ec6ccb61c3ce6816730da2106f07f40b4a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 18:42:41 +0800
Subject: [PATCH] add api, Unregister, QueryTopicAddress.
---
src/shm_queue.cpp | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 652ed5b..215a8ac 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -21,11 +21,6 @@
#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;
@@ -66,33 +61,39 @@
bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId &id)
{
+ Queue *q = Find(shm, id);
+ if (q) {
+ MsgI msg;
+ while (q->TryRead(msg)) {
+ msg.Release();
+ }
+ }
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)
+ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId &remote_id)
{
- Queue *remote = Find(shm, MsgQIdToName(remote_id));
- return remote && remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ return Super::Find(shm, MsgQIdToName(remote_id));
}
-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));
- return remote && remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
+ Queue *remote = Find(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::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