From a100bb2af8afc5fb61abc54e0b616cc44bb0b814 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 26 三月 2021 15:53:35 +0800
Subject: [PATCH] adjust mq length.
---
src/shm_queue.h | 4 ++--
src/shm_queue.cpp | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 5e67d1f..de4505b 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -29,15 +29,27 @@
std::string MsgQIdToName(const MQId& id) { return "shmq" + to_string(id); }
MQId EmptyId() { return nil_uuid(); }
MQId NewId() { return random_generator()(); }
+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;
+ }
}
-ShmMsgQueue::ShmMsgQueue(const MQId &id, ShmType &segment, const uint32_t len):
-SharedQueue(segment, MsgQIdToName(id), id, len, segment.get_segment_manager())
+}
+
+// ShmMsgQueue memory usage: (320 + 16*length) bytes, length >= 2
+ShmMsgQueue::ShmMsgQueue(const MQId &id, ShmType &segment, const int len):
+SharedQueue(segment, MsgQIdToName(id), id, AdjustMQLength(len), segment.get_segment_manager())
{
- printf("queue size: %ld cap: %ld\n", data()->size(), data()->capacity());
}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const uint32_t len):ShmMsgQueue(NewId(), segment, len)
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len):ShmMsgQueue(NewId(), segment, len)
{}
ShmMsgQueue::~ShmMsgQueue()
diff --git a/src/shm_queue.h b/src/shm_queue.h
index 14f43c0..140654c 100644
--- a/src/shm_queue.h
+++ b/src/shm_queue.h
@@ -88,8 +88,8 @@
bool Write(const Msg &buf, const int timeout_ms) { return data()->Write(buf, timeout_ms); }
bool Read(Msg &buf, const int timeout_ms) { return data()->Read(buf, timeout_ms); }
public:
- ShmMsgQueue(const MQId &id, ShmType &segment, const uint32_t len);
- ShmMsgQueue(ShmType &segment, const uint32_t len);
+ ShmMsgQueue(const MQId &id, ShmType &segment, const int len);
+ ShmMsgQueue(ShmType &segment, const int len);
~ShmMsgQueue();
bool Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms);
bool Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms);
--
Gitblit v1.8.0