From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.

---
 src/topic_node.cpp |   77 +++++++++++++++++++++++++++-----------
 1 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index f947f98..2cc5483 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -35,7 +35,7 @@
 } // namespace
 
 TopicNode::TopicNode(SharedMemory &shm) :
-    shm_(shm), sock_node_(shm), sock_request_(shm), sock_reply_(shm), sock_sub_(shm), registered_(false)
+    shm_(shm), sock_node_(shm), sock_client_(shm), sock_server_(shm), sock_sub_(shm), registered_(false), registered_ever_(false)
 {
 	// recv msgs to avoid memory leak.
 	auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
@@ -46,6 +46,12 @@
 {
 	Stop();
 	SockNode().Stop();
+	if (!registered_ever_) {
+		SockNode().Remove();
+		SockClient().Remove();
+		SockServer().Remove();
+		SockSub().Remove();
+	}
 }
 
 void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
@@ -88,7 +94,9 @@
 		bool ok = head.type() == kMsgTypeCommonReply &&
 		          msg.ParseBody(rbody) &&
 		          IsSuccess(rbody.errmsg().errcode());
-		printf("async regisered %s\n", ok ? "ok" : "failed");
+		if (ok) {
+			registered_ever_.store(true);
+		}
 		registered_.store(ok);
 	};
 
@@ -112,7 +120,10 @@
 
 bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	auto &sock = SockNode();
 	MsgHeartbeat body;
@@ -142,7 +153,10 @@
 
 bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	auto &sock = SockServer();
 	MsgRegisterRPC body;
@@ -189,7 +203,10 @@
 
 bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	auto &sock = SockServer();
 
@@ -210,7 +227,10 @@
 
 bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	auto &sock = SockServer();
 
@@ -240,7 +260,7 @@
 		}
 	};
 
-	return SockRequest().Start(onData, nworker);
+	return SockClient().Start(onData, nworker);
 }
 
 bool TopicNode::ClientAsyncRequest(const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
@@ -308,10 +328,13 @@
 
 bool TopicNode::ClientSyncRequest(const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	try {
-		auto &sock = SockRequest();
+		auto &sock = SockClient();
 
 		BHAddress addr;
 		if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
@@ -323,28 +346,29 @@
 			DEFER1(reply_msg.Release(shm_););
 			BHMsgHead reply_head;
 
-			if (sock.SendAndRecv(addr.mq_id().data(), head, request, reply_msg, reply_head, timeout_ms) && reply_head.type() == kMsgTypeRequestTopicReply) {
-				if (reply_msg.ParseBody(out_reply)) {
-					reply_head.mutable_proc_id()->swap(out_proc_id);
-					return true;
-				} else {
-					printf("error parse reply.\n");
-				}
+			if (sock.SendAndRecv(addr.mq_id().data(), head, request, reply_msg, reply_head, timeout_ms) &&
+			    reply_head.type() == kMsgTypeRequestTopicReply &&
+			    reply_msg.ParseBody(out_reply)) {
+				reply_head.mutable_proc_id()->swap(out_proc_id);
+				return true;
 			}
 		} else {
 			SetLastError(eNotFound, "remote not found.");
 		}
 	} catch (...) {
-		printf("error recv data. line: %d\n", __LINE__);
+		SetLastError(eError, __func__ + std::string(" internal errer."));
 	}
 	return false;
 }
 
 bool TopicNode::ClientQueryRPCTopic(const Topic &topic, bhome::msg::BHAddress &addr, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
-	auto &sock = SockRequest();
+	auto &sock = SockClient();
 
 	if (topic_query_cache_.Find(topic, addr)) {
 		return true;
@@ -381,7 +405,10 @@
 
 bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	try {
 		auto &sock = SockPub();
@@ -409,7 +436,10 @@
 
 bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	try {
 		auto &sock = SockSub();
@@ -455,7 +485,10 @@
 
 bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
 {
-	if (!IsRegistered()) { return false; }
+	if (!IsRegistered()) {
+		SetLastError(eNotRegistered, "Not Registered.");
+		return false;
+	}
 
 	auto &sock = SockSub();
 	MsgI msg;

--
Gitblit v1.8.0