From 34cd75f77d0ca94dbdba4e6cc9451fe4d33e78b3 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 19:14:13 +0800
Subject: [PATCH] add api BHQueryProcs.

---
 src/shm_queue.h |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/shm_queue.h b/src/shm_queue.h
index c7d3a23..7871fe0 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -19,15 +19,17 @@
 #ifndef SHM_QUEUE_JE0OEUP3
 #define SHM_QUEUE_JE0OEUP3
 
+#include "robust.h"
 #include "shm.h"
 #include <atomic>
+#include <boost/circular_buffer.hpp>
 #include <chrono>
 
 namespace bhome_shm
 {
 
 template <class D>
-using Circular = robust::CircularBuffer<D, Allocator<D>>;
+using Circular = boost::circular_buffer<D, Allocator<D>>;
 
 template <class D>
 class SharedQueue
@@ -49,28 +51,52 @@
 		} while (steady_clock::now() < end_time);
 		return false;
 	}
-	bool TryRead(D &d) { return queue_.pop_front(d); }
-	bool TryWrite(const D &d) { return queue_.push_back(d); }
+	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;
+		}
+	}
 
 private:
 	Circular<D> queue_;
+	// bhome_shm::Mutex mutex_;
 };
 
 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 {
-			if (TryRead(d)) {
-				return true;
-			} else {
-				robust::QuickSleep();
+			for (int i = 0; i < 100; ++i) {
+				if (TryRead(d)) {
+					return true;
+				}
 			}
+			robust::QuickSleep();
 		} while (steady_clock::now() < end_time);
 		return false;
 	}

--
Gitblit v1.8.0