From 11f6c600e55ca5677f93624efe44d2605cdd908d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 20:18:38 +0800
Subject: [PATCH] reserve #,@ prefix for internal proc id and topic.
---
src/shm_msg_queue.cpp | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index d96c511..be2d2a2 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -31,19 +31,13 @@
} // namespace
-ShmMsgQueue::MQId ShmMsgQueue::NewId()
-{
- static auto &id = GetData();
- return (++id) * 10;
-}
-
-ShmMsgQueue::ShmMsgQueue(const MQId id, ShmType &segment, const int len) :
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const MQId id, const int len) :
id_(id),
queue_(segment, MsgQIdToName(id_), len, segment.get_segment_manager())
{
}
-ShmMsgQueue::ShmMsgQueue(const MQId id, const bool create_or_else_find, ShmType &segment, const int len) :
+ShmMsgQueue::ShmMsgQueue(ShmType &segment, const bool create_or_else_find, const MQId id, const int len) :
id_(id),
queue_(segment, create_or_else_find, MsgQIdToName(id_), len, segment.get_segment_manager())
{
@@ -51,8 +45,11 @@
throw("error create/find msgq " + std::to_string(id_));
}
}
-ShmMsgQueue::ShmMsgQueue(ShmType &segment, const int len) :
- ShmMsgQueue(NewId(), true, segment, len) {}
+ShmMsgQueue::ShmMsgQueue(const int64_t abs_addr, ShmType &segment, const MQId id) :
+ id_(id), queue_(abs_addr, segment, MsgQIdToName(id_))
+{
+ //TODO check some tag.
+}
ShmMsgQueue::~ShmMsgQueue() {}
@@ -81,7 +78,7 @@
if (IsCmd(val)) {
LOG_DEBUG() << "clsing queue " << id << ", has a cmd" << DecodeCmd(val);
} else {
- MsgI(val).Release();
+ MsgI(val, shm).Release();
}
}
}
@@ -93,10 +90,11 @@
return Shmq::Find(shm, MsgQIdToName(remote_id));
}
-bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQId remote_id, int64_t val)
+bool ShmMsgQueue::TrySend(SharedMemory &shm, const MQInfo &remote, const RawData val)
{
try {
- ShmMsgQueue dest(remote_id, false, shm, 1);
+ //TODO find from center, or use offset.
+ ShmMsgQueue dest(remote.offset_, shm, remote.id_);
#ifndef BH_USE_ATOMIC_Q
Guard lock(GetMutex(remote_id));
#endif
--
Gitblit v1.8.0