From 8cbb55f3066f71f5a4328193414d4555c87e96be Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 30 三月 2021 11:41:30 +0800
Subject: [PATCH] refactor.
---
src/shm_queue.cpp | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 263fd94..ffc7c21 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -15,13 +15,14 @@
*
* =====================================================================================
*/
+
#include "shm_queue.h"
#include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include "bh_util.h"
namespace bhome_shm {
-
+using namespace bhome_msg;
using namespace boost::interprocess;
using namespace boost::uuids;
@@ -29,15 +30,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())
-{
- printf("queue size: %ld cap: %ld\n", data()->size(), data()->capacity());
}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const uint32_t len):ShmMsgQueue(NewId(), segment, len)
+// 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)
+{}
+
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len):
+ShmMsgQueue(NewId(), segment, len)
{}
ShmMsgQueue::~ShmMsgQueue()
@@ -45,54 +59,53 @@
Remove();
}
-bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
+bool ShmMsgQueue::Send(const MQId &remote_id, const MsgI &msg, 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);
+ Queue *remote = find(MsgQIdToName(remote_id));
+ return remote && remote->Write(msg, timeout_ms, [](const MsgI&msg){msg.AddRef();});
+}
- memcpy(static_cast<char*>(p) + sizeof(meta), data, size);
- if (remote->Write(p, timeout_ms)) {
- return true;
- } else {
- shm().deallocate(p);
- }
- }
+bool ShmMsgQueue::Send(const MQId &remote_id, const BHMsg &data, const int timeout_ms)
+{
+ MsgI msg;
+ if(msg.Make(shm(), data)) {
+ if(Send(remote_id, msg, timeout_ms)) {
+ return true;
+ } else {
+ msg.Release(shm());
}
}
return false;
}
-bool ShmMsgQueue::Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms)
+/*
+bool ShmMsgQueue::Send(const MQId &remote_id, const void *data, const size_t size, const int timeout_ms)
{
- Msg msg;
- if (Read(msg, timeout_ms)) {
- auto ptr = msg.get<char>();
- if (ptr) {
- DEFER1(shm().deallocate(ptr););
- MsgMetaV1 meta;
- meta.Parse(ptr);
- memcpy(&source_id, meta.src_id_, sizeof(MQId));
- size = meta.data_size_;
- data = malloc(size);
- if (data) {
- memcpy(data, ptr + meta.self_size_, size);
- return true;
- }
+ // 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.
+
+ MsgI msg;
+ if(msg.BuildRequest(shm(), Id(), data, size)) {
+ if(Send(remote_id, msg, timeout_ms)) {
+ return true;
+ } else {
+ msg.Release(shm());
}
}
- source_id = EmptyId();
- data = 0;
- size = 0;
return false;
+}
+//*/
+bool ShmMsgQueue::Recv(BHMsg &msg, const int timeout_ms)
+{
+ MsgI imsg;
+ if (Read(imsg, timeout_ms)) {
+ DEFER1(imsg.Release(shm()););
+ return imsg.Unpack(msg);
+ } else {
+ return false;
+ }
}
} // namespace bhome_shm
-
--
Gitblit v1.8.0