From e7555f04c826e65e59b7e6ff7f3858b7d94f5b73 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 01 六月 2021 17:29:49 +0800
Subject: [PATCH] trivial.
---
src/topic_node.h | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index 1bb3611..3d6767b 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,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();
// 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);
--
Gitblit v1.8.0