From bcd780993c176b93f7393607f8003adf66e6676a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 26 四月 2021 10:27:14 +0800
Subject: [PATCH] fix node default ignore msg.
---
src/shm_queue.cpp | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index 215a8ac..face18b 100644
--- a/src/shm_queue.cpp
+++ b/src/shm_queue.cpp
@@ -18,20 +18,21 @@
#include "shm_queue.h"
#include "bh_util.h"
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
namespace bhome_shm
{
using namespace bhome_msg;
using namespace boost::interprocess;
-using namespace boost::uuids;
namespace
{
-std::string MsgQIdToName(const MQId &id) { return "shmq" + to_string(id); }
-// MQId EmptyId() { return nil_uuid(); }
-MQId NewId() { return random_generator()(); }
+std::string MsgQIdToName(const ShmMsgQueue::MQId id)
+{
+ char buf[40] = "mqOx";
+ int n = sprintf(buf + 4, "%lx", id);
+ return std::string(buf, n + 4);
+}
+
const int AdjustMQLength(const int len)
{
const int kMaxLength = 10000;
@@ -47,19 +48,30 @@
} // namespace
+ShmMsgQueue::MQId ShmMsgQueue::NewId()
+{
+ static auto &id = GetData();
+ return ++id;
+}
// 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(const MQId id, ShmType &segment, const int len) :
+ id_(id),
+ queue_(segment, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager())
{
}
ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), segment, len) {}
+ id_(NewId()),
+ queue_(segment, true, MsgQIdToName(id_), AdjustMQLength(len), segment.get_segment_manager())
+{
+ if (!queue_.IsOk()) {
+ throw("error create msgq " + std::to_string(id_));
+ }
+}
ShmMsgQueue::~ShmMsgQueue() {}
-bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId &id)
+bool ShmMsgQueue::Remove(SharedMemory &shm, const MQId id)
{
Queue *q = Find(shm, id);
if (q) {
@@ -68,15 +80,15 @@
msg.Release();
}
}
- return Super::Remove(shm, MsgQIdToName(id));
+ return Shmq::Remove(shm, MsgQIdToName(id));
}
-ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId &remote_id)
+ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId remote_id)
{
- return Super::Find(shm, MsgQIdToName(remote_id));
+ return Shmq::Find(shm, MsgQIdToName(remote_id));
}
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, OnSend const &onsend)
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, const MsgI &msg, OnSend const &onsend)
{
Queue *remote = Find(shm, remote_id);
if (remote) {
--
Gitblit v1.8.0