From c338820e4db43ad32c20ff429a038b06bcb980f8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 08 四月 2021 18:13:25 +0800
Subject: [PATCH] BIG change, join center,bus; now msg is head+body.
---
src/shm_queue.cpp | 72 ++++++++++++-----------------------
1 files changed, 25 insertions(+), 47 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index cf4c8b4..521f773 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;
@@ -61,62 +66,35 @@
ShmMsgQueue::~ShmMsgQueue()
{
- Remove();
+ // It's not safe to remove, others may still holder pointers and write to it.
+ // TODO use smart_ptr or garbage collection.
+ //Remove();
}
+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, [&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(); });
}
-// bool ShmMsgQueue::Send(const MQId &remote_id, const MsgI &msg, 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.
+
+// bool ShmMsgQueue::Recv(MsgI &imsg, BHMsgHead &head, const int timeout_ms)
// {
-// Queue *remote = Find(MsgQIdToName(remote_id));
-// return remote && remote->Write(msg, timeout_ms, [](const MsgI&msg){msg.AddRef();});
+// if (Read(imsg, timeout_ms)) {
+// // DEFER1(imsg.Release(shm()););
+// return imsg.ParseHead(head);
+// } else {
+// return false;
+// }
// }
-
-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);
- } else {
- return false;
- }
-}
} // namespace bhome_shm
--
Gitblit v1.8.0