From 4fadba32621283dff64cc1b8592896c864f913d4 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期日, 25 四月 2021 15:41:14 +0800
Subject: [PATCH] mq always create new shm, do not find.
---
src/shm_queue.h | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 70039b5..4f576a7 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -107,8 +107,6 @@
public:
SharedQueue(const uint32_t len, Allocator<D> const &alloc) :
Super(len, alloc) {}
- using Super::capacity;
- using Super::size;
template <class Iter, class OnWrite>
int TryWrite(Iter begin, Iter end, const OnWrite &onWrite)
@@ -136,10 +134,11 @@
using namespace bhome_msg;
-class ShmMsgQueue : private ShmObject<SharedQueue<MsgI>>, public StaticDataRef<std::atomic<uint64_t>, ShmMsgQueue>
+class ShmMsgQueue : public StaticDataRef<std::atomic<uint64_t>, ShmMsgQueue>
{
- typedef ShmObject<SharedQueue<MsgI>> Super;
- typedef Super::Data Queue;
+ typedef ShmObject<SharedQueue<MsgI>> Shmq;
+ typedef Shmq::ShmType ShmType;
+ typedef Shmq::Data Queue;
typedef std::function<void()> OnSend;
public:
@@ -152,12 +151,12 @@
~ShmMsgQueue();
static bool Remove(SharedMemory &shm, const MQId id);
MQId Id() const { return id_; }
- using Super::shm;
+ ShmType &shm() const { return queue_.shm(); }
- bool Recv(MsgI &msg, const int timeout_ms) { return data()->Read(msg, timeout_ms); }
- bool TryRecv(MsgI &msg) { return data()->TryRead(msg); }
+ bool Recv(MsgI &msg, const int timeout_ms) { return queue_.data()->Read(msg, timeout_ms); }
+ bool TryRecv(MsgI &msg) { return queue_.data()->TryRead(msg); }
template <class OnData>
- int TryRecvAll(OnData const &onData) { return data()->TryReadAll(onData); }
+ int TryRecvAll(OnData const &onData) { return queue_.data()->TryReadAll(onData); }
static Queue *Find(SharedMemory &shm, const MQId remote_id);
static bool TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend = OnSend());
template <class Iter>
@@ -183,6 +182,8 @@
private:
MQId id_;
+ Shmq &queue() { return queue_; }
+ Shmq queue_;
};
} // namespace bhome_shm
--
Gitblit v1.8.0