From 9bf199a4770b08c03d553129757d960b605e598a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 14 五月 2021 18:05:21 +0800
Subject: [PATCH] add center info at fixed address in shm.
---
src/shm_msg_queue.cpp | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/shm_msg_queue.cpp b/src/shm_msg_queue.cpp
index d96c511..663da1e 100644
--- a/src/shm_msg_queue.cpp
+++ b/src/shm_msg_queue.cpp
@@ -37,13 +37,13 @@
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 +51,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() {}
@@ -93,10 +96,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 MQId remote, int64_t val)
{
try {
- ShmMsgQueue dest(remote_id, false, shm, 1);
+ //TODO find from center, or use offset.
+ ShmMsgQueue dest(shm, false, remote, 1);
#ifndef BH_USE_ATOMIC_Q
Guard lock(GetMutex(remote_id));
#endif
--
Gitblit v1.8.0