From 628c1c21ffb19d8c96ed9ce89531595f9870ab1a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 18:41:02 +0800
Subject: [PATCH] add msg tag; recv all msgs before remove mq.
---
src/shm_queue.cpp | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index df9ce1f..215a8ac 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -61,31 +61,24 @@
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));
}
-ShmMsgQueue::Queue *ShmMsgQueue::FindRemote(SharedMemory &shm, const MQId &remote_id)
+ShmMsgQueue::Queue *ShmMsgQueue::Find(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 = FindRemote(shm, remote_id);
- if (remote) {
- if (onsend) {
- return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
- } else {
- return remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
- }
- } else {
- // SetLestError(eNotFound);
- return false;
- }
+ return Super::Find(shm, MsgQIdToName(remote_id));
}
bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend)
{
- Queue *remote = FindRemote(shm, remote_id);
+ Queue *remote = Find(shm, remote_id);
if (remote) {
if (onsend) {
return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
--
Gitblit v1.8.0