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.h | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 2d5ec3a..93d77df 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -110,22 +110,6 @@
Super(len, alloc) {}
using Super::capacity;
using Super::size;
- template <class Iter, class OnWrite>
- int Write(Iter begin, Iter end, const int timeout_ms, const OnWrite &onWrite)
- {
- auto endtime = MSFromNow(timeout_ms);
- auto timedWritePred = [this, endtime](Guard &lock) {
- return (cond_write_.timed_wait(lock, endtime, [&]() { return !this->full(); }));
- };
- return WriteAllOnCond(begin, end, timedWritePred, onWrite);
- }
-
- template <class OnWrite>
- bool Write(const D &buf, const int timeout_ms, const OnWrite &onWrite) { return Write(&buf, (&buf) + 1, timeout_ms, onWrite); }
- bool Write(const D &buf, const int timeout_ms)
- {
- return Write(buf, timeout_ms, [](const D &buf) {});
- }
template <class Iter, class OnWrite>
int TryWrite(Iter begin, Iter end, const OnWrite &onWrite)
@@ -174,14 +158,31 @@
bool TryRecv(MsgI &msg) { return data()->TryRead(msg); }
template <class OnData>
int TryRecvAll(OnData const &onData) { return data()->TryReadAll(onData); }
-
- static bool Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend = OnSend());
+ static Queue *Find(SharedMemory &shm, const MQId &remote_id);
+ // static bool Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend = OnSend());
static bool TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend = OnSend());
+ template <class Iter>
+ static int TrySendAll(SharedMemory &shm, const MQId &remote_id, const Iter begin, const Iter end, OnSend const &onsend = OnSend())
+ {
+ Queue *remote = Find(shm, remote_id);
+ if (remote) {
+ if (onsend) {
+ return remote->TryWrite(begin, end, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
+ } else {
+ return remote->TryWrite(begin, end, [](const MsgI &msg) { msg.AddRef(); });
+ }
+ } else {
+ // SetLestError(eNotFound);
+ return 0;
+ }
+ }
- template <class... Rest>
- bool Send(const MQId &remote_id, Rest const &...rest) { return Send(shm(), remote_id, rest...); }
+ // template <class... Rest>
+ // bool Send(const MQId &remote_id, Rest const &...rest) { return Send(shm(), remote_id, rest...); }
template <class... Rest>
bool TrySend(const MQId &remote_id, Rest const &...rest) { return TrySend(shm(), remote_id, rest...); }
+ template <class... Rest>
+ int TrySendAll(const MQId &remote_id, Rest const &...rest) { return TrySendAll(shm(), remote_id, rest...); }
size_t Pending() const { return data()->size(); }
};
--
Gitblit v1.8.0