From 28f06bc49a4d8d69f1ea2f767863b7921d12f155 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期六, 08 五月 2021 18:30:48 +0800
Subject: [PATCH] add robust FMutex, works fine; use boost circular.
---
src/shm_msg_queue.h | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/shm_msg_queue.h b/src/shm_msg_queue.h
index f496f0f..f8888f3 100644
--- a/src/shm_msg_queue.h
+++ b/src/shm_msg_queue.h
@@ -26,11 +26,13 @@
class ShmMsgQueue : public StaticDataRef<std::atomic<uint64_t>, ShmMsgQueue>
{
- typedef ShmObject<SharedQ63<4>> Shmq;
- // typedef ShmObject<SharedQueue<int64_t>> Shmq;
+ // typedef ShmObject<SharedQ63<4>> Shmq;
+ typedef ShmObject<SharedQueue<int64_t>> Shmq;
typedef Shmq::ShmType ShmType;
typedef Shmq::Data Queue;
typedef std::function<void()> OnSend;
+ typedef robust::FMutex Mutex;
+ typedef robust::Guard<Mutex> Guard;
public:
typedef uint64_t MQId;
@@ -45,13 +47,22 @@
MQId Id() const { return id_; }
ShmType &shm() const { return queue_.shm(); }
- bool Recv(MsgI &msg, const int timeout_ms) { return queue().Read(msg.OffsetRef(), timeout_ms); }
- bool TryRecv(MsgI &msg) { return queue().TryRead(msg.OffsetRef()); }
+ bool Recv(MsgI &msg, const int timeout_ms)
+ {
+ Guard lock(GetMutex(Id()));
+ return queue().Read(msg.OffsetRef(), timeout_ms);
+ }
+ bool TryRecv(MsgI &msg)
+ {
+ Guard lock(GetMutex(Id()));
+ return queue().TryRead(msg.OffsetRef());
+ }
static Queue *Find(SharedMemory &shm, const MQId remote_id);
static bool TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg);
bool TrySend(const MQId remote_id, const MsgI &msg) { return TrySend(shm(), remote_id, msg); }
private:
+ static Mutex &GetMutex(const MQId id);
MQId id_;
Queue &queue() { return *queue_.data(); }
Shmq queue_;
--
Gitblit v1.8.0