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.cpp | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index 03a6cfb..38c5f1c 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -29,36 +29,23 @@
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())
+ queue_(segment, true, MsgQIdToName(id_)) //, AdjustMQLength(len), segment.get_segment_manager())
{
if (!queue_.IsOk()) {
throw("error create msgq " + std::to_string(id_));
@@ -72,7 +59,7 @@
Queue *q = Find(shm, id);
if (q) {
MsgI msg;
- while (q->TryRead(msg)) {
+ while (q->TryRead(msg.OffsetRef())) {
msg.Release();
}
}
@@ -90,7 +77,7 @@
bool r = false;
if (remote) {
msg.AddRef();
- r = remote->TryWrite(msg);
+ r = remote->TryWrite(msg.Offset());
if (!r) {
msg.Release();
}
--
Gitblit v1.8.0