From 68c7bef33e74f23aa0136ccd6f7faa654d671ebc Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 09:23:01 +0800
Subject: [PATCH] center publish notify; fix topic partial match.
---
src/shm_queue.h | 182 ++++++++++++++++-----------------------------
1 files changed, 65 insertions(+), 117 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 32ccfae..3a2cea6 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -19,10 +19,11 @@
#ifndef SHM_QUEUE_JE0OEUP3
#define SHM_QUEUE_JE0OEUP3
-#include "msg.h"
+#include "robust.h"
#include "shm.h"
+#include <atomic>
#include <boost/circular_buffer.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <chrono>
namespace bhome_shm
{
@@ -30,132 +31,79 @@
template <class D>
using Circular = boost::circular_buffer<D, Allocator<D>>;
-typedef boost::uuids::uuid MQId;
-
template <class D>
-class SharedQueue : private Circular<D>
+class SharedQueue
{
- 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);
- }
-
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 Write(Iter begin, Iter end, const int timeout_ms, const OnWrite &onWrite)
+ queue_(len, alloc) {}
+
+ bool Read(D &d, const int timeout_ms)
{
- 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;
- }
-
- 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;
- }
-};
-
-using namespace bhome_msg;
-
-class ShmMsgQueue : private ShmObject<SharedQueue<MsgI>>
-{
- 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();
- 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... Extra>
- bool Send(const MQId &remote_id, const MsgI &msg, const int timeout_ms, Extra const &...extra)
- {
- return Send(shm(), remote_id, msg, timeout_ms, extra...);
- }
- template <class Body, class... Extra>
- bool Send(const MQId &remote_id, const BHMsgHead &head, const Body &body, const int timeout_ms, Extra const &...extra)
- {
- MsgI msg;
- if (msg.Make(shm(), head, body)) {
- if (Send(shm(), remote_id, msg, timeout_ms, extra...)) {
+ using namespace std::chrono;
+ auto end_time = steady_clock::now() + milliseconds(timeout_ms);
+ do {
+ if (TryRead(d)) {
return true;
} else {
- msg.Release(shm());
+ std::this_thread::sleep_for(1ms);
}
- }
+ } while (steady_clock::now() < end_time);
return false;
}
+ bool TryRead(D &d)
+ {
+ // bhome_shm::Guard lock(mutex_);
+ if (!queue_.empty()) {
+ d = queue_.front();
+ queue_.pop_front();
+ return true;
+ } else {
+ return false;
+ }
+ }
+ bool TryWrite(const D &d)
+ {
+ // bhome_shm::Guard lock(mutex_);
+ if (!queue_.full()) {
+ queue_.push_back(d);
+ return true;
+ } else {
+ return false;
+ }
+ }
- size_t Pending() const { return data()->size(); }
+private:
+ Circular<D> queue_;
+};
+
+template <int Power = 4>
+class SharedQ63
+{
+public:
+ template <class... T>
+ explicit SharedQ63(T &&...t) {} // easy testing
+
+ typedef int64_t Data;
+ bool Read(Data &d, const int timeout_ms)
+ {
+ using namespace std::chrono;
+ auto end_time = steady_clock::now() + milliseconds(timeout_ms);
+ do {
+ for (int i = 0; i < 100; ++i) {
+ if (TryRead(d)) {
+ return true;
+ }
+ }
+ std::this_thread::sleep_for(1ms);
+ } while (steady_clock::now() < end_time);
+ return false;
+ }
+ bool TryRead(Data &d, const bool try_more = true) { return queue_.pop(d, try_more); }
+ bool TryWrite(const Data d, const bool try_more = true) { return queue_.push(d, try_more); }
+
+private:
+ robust::AtomicQueue<Power, Data> queue_;
};
} // namespace bhome_shm
--
Gitblit v1.8.0