From 1fbfef2a51db4a3bac9d8a5b87af94a40a913b7a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期日, 25 四月 2021 15:33:40 +0800
Subject: [PATCH] change mqid from uuid to uint64.
---
src/shm_queue.cpp | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/shm_queue.cpp b/src/shm_queue.cpp
index df9ce1f..1be8021 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,8 +48,13 @@
} // 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) :
+ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) :
Super(segment, MsgQIdToName(id), AdjustMQLength(len), segment.get_segment_manager()),
id_(id)
{
@@ -59,33 +65,26 @@
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) {
+ MsgI msg;
+ while (q->TryRead(msg)) {
+ msg.Release();
+ }
+ }
return Super::Remove(shm, MsgQIdToName(id));
}
-ShmMsgQueue::Queue *ShmMsgQueue::FindRemote(SharedMemory &shm, const MQId &remote_id)
+ShmMsgQueue::Queue *ShmMsgQueue::Find(SharedMemory &shm, const MQId remote_id)
{
- return Find(shm, MsgQIdToName(remote_id));
-}
-bool ShmMsgQueue::Send(SharedMemory &shm, const MQId &remote_id, const MsgI &msg, const int timeout_ms, OnSend const &onsend)
-{
- Queue *remote = FindRemote(shm, remote_id);
- if (remote) {
- if (onsend) {
- return remote->Write(msg, timeout_ms, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
- } else {
- return remote->Write(msg, timeout_ms, [](const MsgI &msg) { msg.AddRef(); });
- }
- } else {
- // SetLestError(eNotFound);
- return false;
- }
+ return Super::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 = FindRemote(shm, remote_id);
+ Queue *remote = Find(shm, remote_id);
if (remote) {
if (onsend) {
return remote->TryWrite(msg, [&onsend](const MsgI &msg) { onsend(); msg.AddRef(); });
--
Gitblit v1.8.0