From 4deeafbd502dc3c57dab8ad6ca601a38a9e7f074 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期二, 06 四月 2021 19:10:49 +0800 Subject: [PATCH] add uni center. --- src/shm_queue.cpp | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp index f2fb45b..dcb5a9e 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,7 +66,9 @@ 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) @@ -69,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