From 72bffb0807925a156b076b71f78c848a08d27b87 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 29 四月 2021 10:55:35 +0800
Subject: [PATCH] refactor mutex.
---
src/shm_queue.h | 127 +++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 69 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 140654c..11f9893 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -20,82 +20,71 @@
#define SHM_QUEUE_JE0OEUP3
#include "shm.h"
-#include "msg.h"
-#include <boost/circular_buffer.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <atomic>
+#include <chrono>
-namespace bhome_shm {
-
-template <class D> using Circular = boost::circular_buffer<D, Allocator<D> >;
-
-typedef boost::uuids::uuid MQId;
+namespace bhome_shm
+{
template <class D>
-class SyncedQueue : private Circular<D>
+using Circular = robust::CircularBuffer<D, Allocator<D>>;
+
+
+template <class D>
+class SharedQueue
{
- typedef Circular<D> Super;
- Mutex mutex_;
- Cond cond_read_;
- Cond cond_write_;
- Mutex & mutex() { return mutex_; }
- const MQId id_;
-
- 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) :
+ queue_(len, alloc) {}
- 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 TryWrite(const D &d, const OnWrite &onWrite)
+ {
+ Guard lock(mutex());
+ if (!queue_.full()) {
+ onWrite(d);
+ queue_.push_back(d);
+ return true;
+ } else {
+ return false;
+ }
+ }
-class ShmMsgQueue : private ShmObject<SyncedQueue<Msg> >
-{
- 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); }
-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); }
+ bool TryWrite(const D &d)
+ {
+ Guard lock(mutex());
+ return !queue_.full() ? (queue_.push_back(d), true) : false;
+ }
+
+ bool Read(D &d, const int timeout_ms)
+ {
+ using namespace std::chrono;
+ auto end_time = steady_clock::now() + milliseconds(timeout_ms);
+ do {
+ if (TryRead(d)) {
+ return true;
+ } else {
+ robust::QuickSleep();
+ }
+ } while (steady_clock::now() < end_time);
+ return false;
+ }
+ bool TryRead(D &d)
+ {
+ Guard lock(mutex());
+ if (!queue_.empty()) {
+ queue_.pop_front(d);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+private:
+ typedef Circular<D> Queue;
+ Queue queue_;
+ Mutex mutex_;
+ Mutex &mutex() { return mutex_; }
};
} // namespace bhome_shm
--
Gitblit v1.8.0