From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置
---
src/topic_node.h | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index dcc9518..9e7eed2 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -34,14 +34,17 @@
SharedMemory &shm_;
ProcInfo info_;
- SharedMemory &shm() { return shm_; }
+ SharedMemory &shm() const { return shm_; }
+ const MQInfo &CenterAddr() const { return BHTopicCenterAddress(shm()); }
+ 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);
+ 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);
@@ -53,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);
@@ -69,7 +73,15 @@
// subscribe
typedef std::function<void(const std::string &proc_id, const MsgPublish &data)> SubDataCB;
bool SubscribeStartWorker(const SubDataCB &tdcb, int nworker = 2);
- bool Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms);
+ bool Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+ {
+ return DoSubscribe(topics, false, reply_body, timeout_ms);
+ }
+ bool SubscribeNet(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+ {
+ return DoSubscribe(topics, true, reply_body, timeout_ms);
+ }
+ bool DoSubscribe(MsgTopicList &topics, const bool net, MsgCommonReply &reply_body, const int timeout_ms);
bool RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms);
void Start(ServerAsyncCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker = 2);
@@ -159,8 +171,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