From 6c07fe29a5185835f28059f627a1d30e462da28b Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 29 六月 2021 14:01:19 +0800
Subject: [PATCH] add notify node change.
---
src/topic_node.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index c421048..1425844 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -39,12 +39,12 @@
const MQInfo &BusAddr() const { return BHTopicBusAddress(shm()); }
public:
- TopicNode(SharedMemory &shm);
+ TopicNode(SharedMemory &shm, MQId ssn_id = 0);
~TopicNode();
// topic node
- bool Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms) { return UniRegister(false, proc, reply_body, timeout_ms); }
- bool UniRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
+ bool Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms) { return DoRegister(false, proc, reply_body, timeout_ms); }
+ bool DoRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
bool Unregister(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
bool Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
bool Heartbeat(const int timeout_ms);
@@ -56,7 +56,8 @@
typedef std::function<void(void *src_info, std::string &client_proc_id, MsgRequestTopic &request)> ServerAsyncCB;
bool ServerStart(ServerSyncCB const &cb, const int nworker = 2);
bool ServerStart(ServerAsyncCB const &cb, const int nworker = 2);
- bool ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms);
+ bool ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms) { return DoServerRegisterRPC(false, topics, reply, timeout_ms); }
+ bool DoServerRegisterRPC(const bool internal, MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms);
bool ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms);
bool ServerSendReply(void *src_info, const MsgRequestTopicReply &reply);
@@ -162,8 +163,8 @@
bool Init();
bool Valid() const { return state() != eStateUninited; }
std::mutex mutex_;
- MQId ssn_id_ = 0;
std::atomic<State> state_;
+ MQId ssn_id_ = 0;
int proc_index_ = -1;
TopicQueryCache topic_query_cache_;
--
Gitblit v1.8.0