From f51636c193d032723c47343e39ff8296db350200 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 29 三月 2021 18:04:00 +0800
Subject: [PATCH] change msg to use protobuf, add more msg type.
---
src/shm_queue.cpp | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 8d90083..ffc7c21 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -15,6 +15,7 @@
*
* =====================================================================================
*/
+
#include "shm_queue.h"
#include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp>
@@ -47,10 +48,10 @@
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(ShmType &segment, const int len):
+ShmMsgQueue(NewId(), segment, len)
{}
ShmMsgQueue::~ShmMsgQueue()
@@ -58,21 +59,16 @@
Remove();
}
-bool ShmMsgQueue::Send(const MQId &remote_id, const Msg &msg, const int timeout_ms)
+bool ShmMsgQueue::Send(const MQId &remote_id, const MsgI &msg, const int timeout_ms)
{
Queue *remote = find(MsgQIdToName(remote_id));
- return remote && remote->Write(msg, timeout_ms, [](const Msg&msg){msg.AddRef();});
+ return remote && remote->Write(msg, timeout_ms, [](const MsgI&msg){msg.AddRef();});
}
-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 BHMsg &data, const int timeout_ms)
{
- // 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.
-
- Msg msg;
- if(msg.Build(shm(), Id(), data, size, false)) {
+ MsgI msg;
+ if(msg.Make(shm(), data)) {
if(Send(remote_id, msg, timeout_ms)) {
return true;
} else {
@@ -82,30 +78,34 @@
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)) {
- DEFER1(msg.Release(shm()););
+ // 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.
- auto ptr = msg.get<char>();
- if (ptr) {
- MsgMetaV1 meta;
- meta.Parse(ptr);
- source_id = meta.src_id_;
- size = meta.data_size_;
- data = malloc(size);
- if (data) {
- memcpy(data, ptr + meta.self_size_, size);
- return true;
- }
+ 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