From 8967e7f2f8b94dc032135707e16c8a9f233d0db6 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 03 六月 2021 13:32:16 +0800
Subject: [PATCH] rafactor, remove old todo, add some err msg.
---
src/topic_node.h | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index 81bf718..8c08fcf 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -19,7 +19,7 @@
#define TOPIC_NODE_YVKWA6TF
#include "msg.h"
-#include "socket.h"
+#include "shm_socket.h"
#include <atomic>
#include <memory>
#include <mutex>
@@ -34,25 +34,30 @@
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);
bool QueryTopicAddress(BHAddress &dest, MsgQueryTopic &query, MsgQueryTopicReply &reply_body, const int timeout_ms);
+ bool QueryProcs(BHAddress &dest, MsgQueryProc &query, MsgQueryProcReply &reply_body, const int timeout_ms);
// topic rpc server
typedef std::function<bool(const std::string &client_proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply)> ServerSyncCB;
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);
--
Gitblit v1.8.0