From 3b93dc0dc34008cf25b2b12f6b026b3d9e4ed623 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 30 四月 2021 12:48:14 +0800
Subject: [PATCH] guard shm alloc; rm OnWrite,dup lock in shm queue.
---
src/shm_queue.h | 34 ++--------------------------------
1 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 11f9893..7e4ec31 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -29,32 +29,12 @@
template <class D>
using Circular = robust::CircularBuffer<D, Allocator<D>>;
-
template <class D>
class SharedQueue
{
public:
SharedQueue(const uint32_t len, Allocator<D> const &alloc) :
queue_(len, alloc) {}
-
- 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;
- }
- }
-
- 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)
{
@@ -69,22 +49,12 @@
} 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;
- }
- }
+ bool TryRead(D &d) { return queue_.pop_front(d); }
+ bool TryWrite(const D &d) { return queue_.push_back(d); }
private:
typedef Circular<D> Queue;
Queue queue_;
- Mutex mutex_;
- Mutex &mutex() { return mutex_; }
};
} // namespace bhome_shm
--
Gitblit v1.8.0