From 36e6a35a886252516f168b90f7a9a7c1c5177312 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期六, 08 五月 2021 15:57:01 +0800 Subject: [PATCH] center alloc node queue; node just find them. --- src/shm_msg_queue.cpp | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp index ae019bf..17558de 100644 --- a/src/shm_msg_queue.cpp +++ b/src/shm_msg_queue.cpp @@ -29,41 +29,30 @@ return std::string(buf, n + 4); } -const int AdjustMQLength(const int len) -{ - const int kMaxLength = 10000; - const int kDefaultLen = 12; - if (len <= 0) { - return kDefaultLen; - } else if (len < kMaxLength) { - return len; - } else { - return kMaxLength; - } -} - } // namespace ShmMsgQueue::MQId ShmMsgQueue::NewId() { static auto &id = GetData(); - return ++id; + return (++id) * 10; } -// ShmMsgQueue memory usage: (320 + 16*length) bytes, length >= 2 + ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) : id_(id), - queue_(segment, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager()) + queue_(segment, MsgQIdToName(id_)) //, AdjustMQLength(len), segment.get_segment_manager()) { } -ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) : - id_(NewId()), - queue_(segment, true, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager()) +ShmMsgQueue::ShmMsgQueue(const MQId id, const bool create_or_else_find, ShmType &segment, const int len) : + id_(id), + queue_(segment, create_or_else_find, MsgQIdToName(id_)) { if (!queue_.IsOk()) { - throw("error create msgq " + std::to_string(id_)); + throw("error create/find msgq " + std::to_string(id_)); } } +ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) : + ShmMsgQueue(NewId(), true, segment, len) {} ShmMsgQueue::~ShmMsgQueue() {} @@ -72,7 +61,7 @@ Queue *q = Find(shm, id); if (q) { MsgI msg; - while (q->TryRead(msg)) { + while (q->TryRead(msg.OffsetRef())) { msg.Release(); } } @@ -84,19 +73,18 @@ return Shmq::Find(shm, MsgQIdToName(remote_id)); } -bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend) +bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, MsgI msg) { Queue *remote = Find(shm, remote_id); + bool r = false; if (remote) { - if (onsend) { - return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); }); - } else { - return remote->TryWrite(msg, [](const MsgI &msg) { msg.AddRef(); }); + msg.AddRef(); + r = remote->TryWrite(msg.Offset()); + if (!r) { + msg.Release(); } - } else { - // SetLestError(eNotFound); - return false; } + return r; } // Test shows that in the 2 cases: -- Gitblit v1.8.0