From d89ff0ad812cdf178b911843bc3e8c04b2f00845 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 03 六月 2021 10:29:51 +0800
Subject: [PATCH] center remove old shm on start.
---
src/topic_node.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index c421048..8c08fcf 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);
--
Gitblit v1.8.0