From 1b167ec5ad101ac44451381e26cc73ab5d67d2a1 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 26 四月 2021 16:37:52 +0800
Subject: [PATCH] fix socket busy loop; del locked readall; refactor.
---
src/shm_queue.h | 91 ++++++---------------------------------------
1 files changed, 13 insertions(+), 78 deletions(-)
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 93d77df..5dbda96 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -19,8 +19,8 @@
#ifndef SHM_QUEUE_JE0OEUP3
#define SHM_QUEUE_JE0OEUP3
-#include "msg.h"
#include "shm.h"
+#include <atomic>
#include <boost/circular_buffer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
@@ -29,8 +29,6 @@
template <class D>
using Circular = boost::circular_buffer<D, Allocator<D>>;
-
-typedef boost::uuids::uuid MQId;
template <class D>
class SharedQueue : private Circular<D>
@@ -60,30 +58,21 @@
return [this](Guard &lock) { return !this->empty(); };
}
- template <class Pred, class OnData>
- int ReadAllOnCond(Pred const &pred, OnData const &onData)
- {
- Guard lock(this->mutex());
- int n = 0;
- while (pred(lock)) {
- ++n;
- onData(this->front());
- this->pop_front();
- this->cond_write_.notify_one();
- }
- return n;
- }
-
template <class Pred>
bool ReadOnCond(D &buf, Pred const &pred)
{
- int flag = 0;
- auto only_once = [&](Guard &lock) { return flag++ == 0 && pred(lock); };
- auto onData = [&buf](D &d) {
- using std::swap;
- swap(buf, d);
+ auto Read = [&]() {
+ Guard lock(this->mutex());
+ if (pred(lock)) {
+ using std::swap;
+ swap(buf, Super::front());
+ Super::pop_front();
+ return true;
+ } else {
+ return false;
+ }
};
- return ReadAllOnCond(only_once, onData);
+ return Read() ? (this->cond_write_.notify_one(), true) : false;
}
template <class Iter, class Pred, class OnWrite>
@@ -95,7 +84,7 @@
Guard lock(mutex());
while (pred(lock)) {
onWrite(*begin);
- this->push_back(*begin);
+ Super::push_back(*begin);
++n;
cond_read_.notify_one();
if (++begin == end) {
@@ -108,8 +97,6 @@
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 TryWrite(Iter begin, Iter end, const OnWrite &onWrite)
@@ -133,58 +120,6 @@
bool Read(D &buf, const int timeout_ms) { return ReadOnCond(buf, TimedReadPred(timeout_ms)); }
bool TryRead(D &buf) { return ReadOnCond(buf, TryReadPred()); }
-};
-
-using namespace bhome_msg;
-
-class ShmMsgQueue : private ShmObject<SharedQueue<MsgI>>
-{
- typedef ShmObject<SharedQueue<MsgI>> Super;
- typedef Super::Data Queue;
- typedef std::function<void()> OnSend;
- 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();
- static bool Remove(SharedMemory &shm, const MQId &id);
- const MQId &Id() const { return id_; }
- using Super::shm;
-
- bool Recv(MsgI &msg, const int timeout_ms) { return data()->Read(msg, timeout_ms); }
- bool TryRecv(MsgI &msg) { return data()->TryRead(msg); }
- template <class OnData>
- int TryRecvAll(OnData const &onData) { return data()->TryReadAll(onData); }
- static Queue *Find(SharedMemory &shm, const MQId &remote_id);
- // static bool Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend = OnSend());
- static bool TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend = OnSend());
- template <class Iter>
- static int TrySendAll(SharedMemory &shm, const MQId &remote_id, const Iter begin, const Iter end, OnSend const &onsend = OnSend())
- {
- Queue *remote = Find(shm, remote_id);
- if (remote) {
- if (onsend) {
- return remote->TryWrite(begin, end, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
- } else {
- return remote->TryWrite(begin, end, [](const MsgI &msg) { msg.AddRef(); });
- }
- } else {
- // SetLestError(eNotFound);
- return 0;
- }
- }
-
- // template <class... Rest>
- // bool Send(const MQId &remote_id, Rest const &...rest) { return Send(shm(), remote_id, rest...); }
- template <class... Rest>
- bool TrySend(const MQId &remote_id, Rest const &...rest) { return TrySend(shm(), remote_id, rest...); }
- template <class... Rest>
- int TrySendAll(const MQId &remote_id, Rest const &...rest) { return TrySendAll(shm(), remote_id, rest...); }
-
- size_t Pending() const { return data()->size(); }
};
} // namespace bhome_shm
--
Gitblit v1.8.0