From 6f9521a6dca494a9f9644d1ccacdee23744dc0e5 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 24 三月 2021 18:34:18 +0800
Subject: [PATCH] add msg meta or header, queue pointer only.
---
src/shm.cpp | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/shm.cpp b/src/shm.cpp
index f052477..d271ef5 100644
--- a/src/shm.cpp
+++ b/src/shm.cpp
@@ -10,48 +10,57 @@
* Revision: none
* Compiler: gcc
*
- * Author: YOUR NAME (),
+ * Author: Li Chao (),
* Organization:
*
* =====================================================================================
*/
+
#include "shm.h"
#include "bh_util.h"
#include <mutex>
+#include <boost/uuid/uuid_io.hpp>
+#include <boost/uuid/uuid_generators.hpp>
namespace bhome_shm {
using namespace boost::interprocess;
+using namespace boost::uuids;
namespace {
-std::string MsgQIdToName(const int id) { return "shmq" + std::to_string(id); }
+std::string MsgQIdToName(const MQId& id) { return "shmq" + to_string(id); }
+MQId EmptyId() { return nil_uuid(); }
+MQId NewId() { return random_generator()(); }
}
-ShmMsgQueue::ShmMsgQueue(MQId id, ShmType &segment, const std::string &name, const uint32_t len):
-SharedQueue(segment, name, id, len, segment.get_segment_manager())
+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(MQId id, ShmType &segment, const uint32_t len):
-ShmMsgQueue(id, segment, MsgQIdToName(id), len)
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const uint32_t len):ShmMsgQueue(NewId(), segment, len)
{}
ShmMsgQueue::~ShmMsgQueue()
{
-
+ Remove();
}
-bool ShmMsgQueue::Send(MQId remote_id, const void *data, const 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)
{
if (data && size) {
Queue *remote = find(MsgQIdToName(remote_id));
if (remote) {
- void *p = shm().allocate(size, std::nothrow);
+ void *p = shm().allocate(sizeof(MsgMetaV1) + size, std::nothrow);
bool r = false;
if (p) {
- Msg buf = { id(), p, size};
- memcpy(p, data, size);
- if (remote->Write(buf, timeout_ms)) {
+ MsgMetaV1 meta;
+ meta.data_size_ = size;
+ memcpy(meta.src_id_, &Id(), sizeof(MQId));
+ meta.Pack(p);
+
+ memcpy(static_cast<char*>(p) + sizeof(meta), data, size);
+ if (remote->Write(p, timeout_ms)) {
return true;
} else {
shm().deallocate(p);
@@ -64,17 +73,19 @@
bool ShmMsgQueue::Recv(MQId &source_id, void *&data, size_t &size, const int timeout_ms)
{
- Msg buf;
- if (Read(buf, timeout_ms) && buf.size_ > 0) {
- DEFER1(shm().deallocate(buf.data_.get()););
- source_id = buf.src_;
- size = buf.size_;
+ Msg msg;
+ if (Read(msg, timeout_ms) && msg) {
+ DEFER1(shm().deallocate(msg.get()););
+ MsgMetaV1 meta;
+ meta.Parse(msg.get());
+ memcpy(&source_id, meta.src_id_, sizeof(MQId));
+ size = meta.data_size_;
if (data = malloc(size)) {
- memcpy(data, buf.data_.get(), size);
+ memcpy(data, static_cast<char*>(msg.get()) + meta.self_size_, size);
return true;
}
}
- source_id = 0;
+ source_id = EmptyId();
data = 0;
size = 0;
return false;
--
Gitblit v1.8.0