From 4e5cb7960ce4e7e66d5190be67426aeca8b55c3d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 09 四月 2021 18:45:08 +0800
Subject: [PATCH] add heartbeat, not tested yet.
---
src/shm_queue.h | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 104 insertions(+), 60 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 140654c..20ff3dc 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -19,83 +19,127 @@
#ifndef SHM_QUEUE_JE0OEUP3
#define SHM_QUEUE_JE0OEUP3
-#include "shm.h"
#include "msg.h"
+#include "shm.h"
#include <boost/circular_buffer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
-namespace bhome_shm {
-
-template <class D> using Circular = boost::circular_buffer<D, Allocator<D> >;
+namespace bhome_shm
+{
+
+template <class D>
+using Circular = boost::circular_buffer<D, Allocator<D>>;
typedef boost::uuids::uuid MQId;
template <class D>
-class SyncedQueue : private Circular<D>
+class SharedQueue : private Circular<D>
{
- typedef Circular<D> Super;
- Mutex mutex_;
- Cond cond_read_;
- Cond cond_write_;
- Mutex & mutex() { return mutex_; }
- const MQId id_;
+ typedef Circular<D> Super;
+ Mutex mutex_;
+ Cond cond_read_;
+ Cond cond_write_;
+ Mutex &mutex() { return mutex_; }
- static boost::posix_time::ptime MSFromNow(const int ms)
- {
- using namespace boost::posix_time;
- ptime cur = boost::posix_time::microsec_clock::universal_time();
- return cur + millisec(ms);
- }
+ static boost::posix_time::ptime MSFromNow(const int ms)
+ {
+ using namespace boost::posix_time;
+ ptime cur = boost::posix_time::microsec_clock::universal_time();
+ return cur + millisec(ms);
+ }
public:
- // template <class...T> SyncedQueue(const MQId &id, T&&...t):Super(t...), id_(id) {}
- SyncedQueue(const MQId &id, const uint32_t len, Allocator<D> const& alloc):Super(len, alloc), id_(id) {}
- using Super::size;
- using Super::capacity;
- const MQId &Id() const { return id_; }
- template <class OnWrite>
- bool Write(const D &buf, const int timeout_ms, const OnWrite &onWrite) {
- Guard lock(mutex());
- if (cond_write_.timed_wait(lock, MSFromNow(timeout_ms), [&]() { return !this->full(); })) {
- onWrite();
- this->push_back(buf);
- cond_read_.notify_one();
- return true;
- } else {
- return false;
- }
- }
- bool Write(const D &buf, const int timeout_ms) { return Write(buf, timeout_ms, [](){}); }
+ SharedQueue(const uint32_t len, Allocator<D> const &alloc) :
+ 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)
+ {
+ int n = 0;
+ if (begin != end) {
+ auto endtime = MSFromNow(timeout_ms);
+ Guard lock(mutex());
+ while (cond_write_.timed_wait(lock, endtime, [&]() { return !this->full(); })) {
+ onWrite(*begin);
+ this->push_back(*begin);
+ ++n;
+ cond_read_.notify_one();
+ if (++begin == end) {
+ break;
+ }
+ }
+ }
+ return n;
+ }
- bool Read(D &buf, const int timeout_ms){
- Guard lock(mutex());
- if (cond_read_.timed_wait(lock, MSFromNow(timeout_ms), [&]() { return !this->empty(); })) {
- using std::swap;
- swap(buf, this->front());
- this->pop_front();
- cond_write_.notify_one();
- return true;
- } else {
- return false;
- }
- }
+ 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 OnData>
+ bool Read(const int timeout_ms, OnData onData)
+ {
+ int n = 0;
+ auto endtime = MSFromNow(timeout_ms);
+ Guard lock(mutex());
+ while (cond_read_.timed_wait(lock, endtime, [&]() { return !this->empty(); })) {
+ const bool more = onData(this->front());
+ this->pop_front();
+ cond_write_.notify_one();
+ ++n;
+ if (!more) {
+ break;
+ }
+ }
+ return n;
+ }
+
+ bool Read(D &buf, const int timeout_ms)
+ {
+ auto read1 = [&](D &d) {
+ using std::swap;
+ swap(buf, d);
+ return false;
+ };
+ return Read(timeout_ms, read1) == 1;
+ }
};
-class ShmMsgQueue : private ShmObject<SyncedQueue<Msg> >
+using namespace bhome_msg;
+
+class ShmMsgQueue : private ShmObject<SharedQueue<MsgI>>
{
- typedef ShmObject<SyncedQueue<Msg> > SharedQueue;
- typedef SharedQueue::Data Queue;
- 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); }
+ typedef ShmObject<SharedQueue<MsgI>> Super;
+ typedef Super::Data Queue;
+ typedef std::function<void()> OnSend;
+ bool Write(const MsgI &buf, const int timeout_ms) { return data()->Write(buf, timeout_ms); }
+ bool Read(MsgI &buf, const int timeout_ms) { return data()->Read(buf, timeout_ms); }
+ MQId id_;
+
+protected:
+ ShmMsgQueue(const std::string &raw_name, ShmType &segment, const int len); // internal use.
public:
- ShmMsgQueue(const MQId &id, ShmType &segment, const int len);
- ShmMsgQueue(ShmType &segment, const int len);
- ~ShmMsgQueue();
- bool Send(const 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);
- const MQId &Id() const { return data()->Id(); }
- bool Send(const MQId &remote_id, const Msg &msg, const int timeout_ms);
- bool Recv(Msg &msg, const int timeout_ms) { return Read(msg, timeout_ms); }
+ ShmMsgQueue(const MQId &id, ShmType &segment, const int len);
+ ShmMsgQueue(ShmType &segment, const int len);
+ ~ShmMsgQueue();
+ static bool Remove(SharedMemory &shm, const MQId &id);
+ const MQId &Id() const { return id_; }
+
+ // bool Recv(MsgI &msg, BHMsgHead &head, const int timeout_ms);
+ bool Recv(MsgI &msg, const int timeout_ms) { return Read(msg, timeout_ms); }
+ static bool Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend);
+ static bool Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms);
+
+ template <class... Rest>
+ bool Send(const MQId &remote_id, Rest const &...rest) { return Send(shm(), remote_id, rest...); }
+ size_t Pending() const { return data()->size(); }
};
} // namespace bhome_shm
--
Gitblit v1.8.0