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 | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 263fd94..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()
@@ -45,26 +58,25 @@
Remove();
}
+bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
+{
+ Queue *remote = find(MsgQIdToName(remote_id));
+ 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)
{
- if (data && size) {
- Queue *remote = find(MsgQIdToName(remote_id));
- if (remote) {
- void *p = shm().allocate(sizeof(MsgMetaV1) + size, std::nothrow);
- bool r = false;
- if (p) {
- MsgMetaV1 meta;
- meta.data_size_ = size;
- memcpy(meta.src_id_, &Id(), sizeof(MQId));
- meta.Pack(p);
+ // Test shows that in the 2 cases:
+ // 1) build msg first, then find remote queue;
+ // 2) find remote queue first, then build msg;
+ // 1 is about 50% faster than 2, maybe cache related.
- memcpy(static_cast<char*>(p) + sizeof(meta), data, size);
- if (remote->Write(p, timeout_ms)) {
- return true;
- } else {
- shm().deallocate(p);
- }
- }
+ Msg msg;
+ if(msg.Build(shm(), Id(), data, size, false)) {
+ if(Send(remote_id, msg, timeout_ms)) {
+ return true;
+ } else {
+ msg.Release(shm());
}
}
return false;
@@ -74,12 +86,13 @@
{
Msg msg;
if (Read(msg, timeout_ms)) {
+ DEFER1(msg.Release(shm()););
+
auto ptr = msg.get<char>();
if (ptr) {
- DEFER1(shm().deallocate(ptr););
MsgMetaV1 meta;
meta.Parse(ptr);
- memcpy(&source_id, meta.src_id_, sizeof(MQId));
+ source_id = meta.src_id_;
size = meta.data_size_;
data = malloc(size);
if (data) {
--
Gitblit v1.8.0