From 3931f83205f153f2bc7fc36d1a894cdc3f14b4db Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 21 四月 2021 16:52:51 +0800
Subject: [PATCH] change node socket to vector; try lock free queue.
---
src/shm_queue.cpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 2006496..df9ce1f 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;
@@ -69,9 +64,13 @@
return Super::Remove(shm, MsgQIdToName(id));
}
+ShmMsgQueue::Queue *ShmMsgQueue::FindRemote(SharedMemory &shm, const MQId &remote_id)
+{
+ return Find(shm, MsgQIdToName(remote_id));
+}
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));
+ Queue *remote = FindRemote(shm, remote_id);
if (remote) {
if (onsend) {
return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
@@ -86,7 +85,7 @@
bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend)
{
- Queue *remote = Find(shm, MsgQIdToName(remote_id));
+ Queue *remote = FindRemote(shm, remote_id);
if (remote) {
if (onsend) {
return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
--
Gitblit v1.8.0