From 9cf3ddc288193e2fe645f34388322f9586ee043d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 24 三月 2021 16:23:24 +0800
Subject: [PATCH] change mq id from int to uuid.
---
src/shm.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/shm.h b/src/shm.h
index 94ead7f..0ba4e8c 100644
--- a/src/shm.h
+++ b/src/shm.h
@@ -21,9 +21,11 @@
#include <boost/interprocess/managed_shared_memory.hpp>
#include <boost/interprocess/sync/interprocess_condition.hpp>
+#include <boost/interprocess/containers/string.hpp>
#include <boost/circular_buffer.hpp>
#include <boost/noncopyable.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/uuid/uuid.hpp>
namespace bhome_shm {
@@ -98,7 +100,7 @@
template <class D> using Circular = boost::circular_buffer<D, Allocator<D> >;
-typedef int MQId;
+typedef boost::uuids::uuid MQId;
template <class D>
class SyncedQueue : private Circular<D>
{
@@ -120,7 +122,7 @@
template <class...T> SyncedQueue(MQId id, T&&...t):Super(t...), id_(id) {}
using Super::size;
using Super::capacity;
- MQId id() const { return id_; }
+ MQId Id() const { return id_; }
bool Write(D buf, const int timeout_ms) {
Guard lock(mutex());
if (cond_write_.timed_wait(lock, MSFromNow(timeout_ms), [&]() { return !this->full(); })) {
@@ -152,21 +154,20 @@
size_t size_;
};
-
class ShmMsgQueue : private ShmObject<SyncedQueue<Msg> >
{
typedef ShmObject<SyncedQueue<Msg> > SharedQueue;
typedef SharedQueue::Data Queue;
- ShmMsgQueue(MQId id, ShmType &segment, const std::string &name, const uint32_t len);
bool Write(const Msg &buf, const int timeout_ms) { return data()->Write(buf, timeout_ms); }
bool Read(Msg &buf, const int timeout_ms) { return data()->Read(buf, timeout_ms); }
public:
ShmMsgQueue(MQId id, ShmType &segment, const uint32_t len);
+ ShmMsgQueue(ShmType &segment, const uint32_t len);
~ShmMsgQueue();
bool Send(MQId remote_id, const void *data, const size_t size, const int timeout_ms);
bool Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms);
using SharedQueue::Remove;
- MQId id() const { return data()->id(); }
+ MQId Id() const { return data()->Id(); }
};
} // namespace bhome_shm
--
Gitblit v1.8.0