From 7ecd6323ffedbfef92c87c02b2a8680dd53b772c Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 06 五月 2021 19:37:50 +0800
Subject: [PATCH] rename atomic queue io function.
---
src/shm_msg_queue.h | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/shm_msg_queue.h b/src/shm_msg_queue.h
index d7b33af..aff931c 100644
--- a/src/shm_msg_queue.h
+++ b/src/shm_msg_queue.h
@@ -26,7 +26,8 @@
class ShmMsgQueue : public StaticDataRef<std::atomic<uint64_t>, ShmMsgQueue>
{
- typedef ShmObject<SharedQueue<MsgI>> Shmq;
+ typedef ShmObject<SharedQ63<4>> Shmq;
+ // typedef ShmObject<SharedQueue<int64_t>> Shmq;
typedef Shmq::ShmType ShmType;
typedef Shmq::Data Queue;
typedef std::function<void()> OnSend;
@@ -43,34 +44,15 @@
MQId Id() const { return id_; }
ShmType &shm() const { return queue_.shm(); }
- bool Recv(MsgI &msg, const int timeout_ms) { return queue_.data()->Read(msg, timeout_ms); }
- bool TryRecv(MsgI &msg) { return queue_.data()->TryRead(msg); }
+ bool Recv(MsgI &msg, const int timeout_ms) { return queue().Read(msg.OffsetRef(), timeout_ms); }
+ bool TryRecv(MsgI &msg) { return queue().TryRead(msg.OffsetRef()); }
static Queue *Find(SharedMemory &shm, const MQId remote_id);
- 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 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...); }
+ static bool TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg);
+ bool TrySend(const MQId remote_id, const MsgI &msg) { return TrySend(shm(), remote_id, msg); }
private:
MQId id_;
- Shmq &queue() { return queue_; }
+ Queue &queue() { return *queue_.data(); }
Shmq queue_;
};
--
Gitblit v1.8.0