From 5657dca25451cfb63a90a3908db0c464fe3f343d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 29 三月 2021 14:16:49 +0800
Subject: [PATCH] add protobuf; refactor.
---
src/shm_queue.cpp | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 77add97..8d90083 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -21,7 +21,7 @@
#include "bh_util.h"
namespace bhome_shm {
-
+using namespace bhome_msg;
using namespace boost::interprocess;
using namespace boost::uuids;
@@ -29,15 +29,28 @@
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):
+Super(segment, MsgQIdToName(id), AdjustMQLength(len), segment.get_segment_manager()),
+id_(id)
{
- 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()
@@ -48,17 +61,7 @@
bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
{
Queue *remote = find(MsgQIdToName(remote_id));
-
- if(!remote) {
- return false;
- }
- msg.AddRef();
- if (remote->Write(msg, timeout_ms)) {
- return true;
- } else {
- msg.RemoveRef();
- return false;
- }
+ return remote && remote->Write(msg, timeout_ms, [](const Msg&msg){msg.AddRef();});
}
bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
@@ -69,13 +72,11 @@
// 1 is about 50% faster than 2, maybe cache related.
Msg msg;
- if (msg.Build(shm(), Id(), data, size, false)) {
- if (Send(remote_id, msg, timeout_ms)) {
+ if(msg.Build(shm(), Id(), data, size, false)) {
+ if(Send(remote_id, msg, timeout_ms)) {
return true;
} else {
- if (msg.RemoveRef() == 0) { // works for both refcounted and not counted.
- msg.FreeFrom(shm());
- }
+ msg.Release(shm());
}
}
return false;
@@ -85,7 +86,7 @@
{
Msg msg;
if (Read(msg, timeout_ms)) {
- DEFER1(if (msg.RemoveRef() == 0) { msg.FreeFrom(shm()); });
+ DEFER1(msg.Release(shm()););
auto ptr = msg.get<char>();
if (ptr) {
--
Gitblit v1.8.0