From 65a230ec6ccb61c3ce6816730da2106f07f40b4a Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 18:42:41 +0800
Subject: [PATCH] add api, Unregister, QueryTopicAddress.
---
src/topic_node.cpp | 142 +++++++++++++++++++++++++++-------------------
1 files changed, 83 insertions(+), 59 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 8bf9cf8..24bc4bb 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -111,13 +111,46 @@
return sock.Send(&BHTopicCenterAddress(), head, body, onResult);
} else {
MsgI reply;
- DEFER1(reply.Release(shm_););
+ DEFER1(reply.Release(););
BHMsgHead reply_head;
bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
if (r) {
CheckResult(reply, reply_head, reply_body);
}
return IsOnline();
+ }
+}
+bool TopicNode::Unregister(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
+{
+ info_.Clear();
+ state_cas(eStateOnline, eStateOffline);
+
+ auto &sock = SockNode();
+ MsgUnregister body;
+ body.mutable_proc()->Swap(&proc);
+
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ AddRoute(head, sock.id());
+
+ auto CheckResult = [this](MsgI &msg, BHMsgHead &head, MsgCommonReply &rbody) {
+ bool r = head.type() == kMsgTypeCommonReply &&
+ msg.ParseBody(rbody) &&
+ IsSuccess(rbody.errmsg().errcode());
+ return r;
+ };
+
+ if (timeout_ms == 0) {
+ auto onResult = [this, CheckResult](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
+ MsgCommonReply body;
+ CheckResult(imsg, head, body);
+ };
+ return sock.Send(&BHTopicCenterAddress(), head, body, onResult);
+ } else {
+ MsgI reply;
+ DEFER1(reply.Release(););
+ BHMsgHead reply_head;
+ bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ return r && CheckResult(reply, reply_head, reply_body);
}
}
@@ -139,7 +172,7 @@
return sock.Send(&BHTopicCenterAddress(), head, body);
} else {
MsgI reply;
- DEFER1(reply.Release(shm_););
+ DEFER1(reply.Release(););
BHMsgHead reply_head;
bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply && reply.ParseBody(reply_body);
@@ -152,6 +185,25 @@
proc.set_proc_id(proc_id());
MsgCommonReply reply_body;
return Heartbeat(proc, reply_body, timeout_ms);
+}
+
+bool TopicNode::QueryTopicAddress(MsgQueryTopic &query, MsgQueryTopicReply &reply_body, const int timeout_ms)
+{
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+ auto &sock = SockNode();
+
+ BHMsgHead head(InitMsgHead(GetType(query), proc_id()));
+ AddRoute(head, sock.id());
+
+ MsgI reply;
+ DEFER1(reply.Release());
+ BHMsgHead reply_head;
+ return (sock.SendAndRecv(&BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
+ reply_head.type() == kMsgTypeQueryTopicReply &&
+ reply.ParseBody(reply_body));
}
bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
@@ -172,7 +224,7 @@
return sock.Send(&BHTopicCenterAddress(), head, body);
} else {
MsgI reply;
- DEFER1(reply.Release(shm_););
+ DEFER1(reply.Release(););
BHMsgHead reply_head;
bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply;
@@ -283,7 +335,7 @@
return SockClient().Start(onData, nworker);
}
-bool TopicNode::ClientAsyncRequest(const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
+bool TopicNode::ClientAsyncRequest(const BHAddress &remote_addr, const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
{
if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
@@ -317,39 +369,14 @@
try {
BHAddress addr;
-#if 1
return (ClientQueryRPCTopic(req.topic(), addr, 3000)) && SendTo(addr, req, cb);
-#else
- if (topic_query_cache_.Pick(req.topic(), addr)) {
- return SendTo(addr, req, cb);
- }
-
- auto &sock = SockClient();
- MsgQueryTopic query;
- query.set_topic(req.topic());
- BHMsgHead head(InitMsgHead(GetType(query), proc_id()));
- AddRoute(head, sock.id());
-
- auto onQueryResult = [this, SendTo, req, cb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
- MsgQueryTopicReply rep;
- if (head.type() == kMsgTypeQueryTopicReply && imsg.ParseBody(rep)) {
- auto &addr = rep.address();
- if (!addr.mq_id().empty()) {
- topic_query_cache_.Store(req.topic(), addr);
- SendTo(addr, req, cb);
- }
- }
- };
- return sock.Send(&BHTopicCenterAddress(), head, query, std::move(onQueryResult));
-#endif
-
} catch (...) {
SetLastError(eError, "internal error.");
return false;
}
}
-bool TopicNode::ClientSyncRequest(const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
+bool TopicNode::ClientSyncRequest(const BHAddress &remote_addr, const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
{
if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
@@ -366,7 +393,7 @@
head.set_topic(request.topic());
MsgI reply_msg;
- DEFER1(reply_msg.Release(shm_););
+ DEFER1(reply_msg.Release(););
BHMsgHead reply_head;
if (sock.SendAndRecv(addr.mq_id().data(), head, request, reply_msg, reply_head, timeout_ms) &&
@@ -384,6 +411,22 @@
return false;
}
+int TopicNode::QueryRPCTopics(const Topic &topic, std::vector<NodeAddress> &addr, const int timeout_ms)
+{
+ int n = 0;
+ MsgQueryTopic query;
+ query.set_topic(topic);
+ MsgQueryTopicReply rep;
+ if (QueryTopicAddress(query, rep, timeout_ms)) {
+ auto &ls = rep.node_address();
+ n = ls.size();
+ for (auto &na : ls) {
+ addr.push_back(na);
+ }
+ }
+ return n;
+}
+
bool TopicNode::ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms)
{
if (!IsOnline()) {
@@ -391,35 +434,16 @@
return false;
}
- auto &sock = SockClient();
-
if (topic_query_cache_.Find(topic, addr)) {
return true;
}
-
- MsgQueryTopic query;
- query.set_topic(topic);
- BHMsgHead head(InitMsgHead(GetType(query), proc_id()));
- AddRoute(head, sock.id());
-
- MsgI reply;
- DEFER1(reply.Release(shm_));
- BHMsgHead reply_head;
-
- if (sock.SendAndRecv(&BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms)) {
- if (reply_head.type() == kMsgTypeQueryTopicReply) {
- MsgQueryTopicReply rep;
- if (reply.ParseBody(rep)) {
- addr = rep.address();
- if (addr.mq_id().empty()) {
- return false;
- } else {
- topic_query_cache_.Store(topic, addr);
- return true;
- }
- }
+ std::vector<NodeAddress> lst;
+ if (QueryRPCTopics(topic, lst, timeout_ms)) {
+ addr = lst.front().addr();
+ if (!addr.mq_id().empty()) {
+ topic_query_cache_.Store(topic, addr);
+ return true;
}
- } else {
}
return false;
}
@@ -442,7 +466,7 @@
return sock.Send(&BHTopicBusAddress(), head, pub);
} else {
MsgI reply;
- DEFER1(reply.Release(shm()););
+ DEFER1(reply.Release(););
BHMsgHead reply_head;
MsgCommonReply reply_body;
return sock.SendAndRecv(&BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
@@ -475,7 +499,7 @@
return sock.Send(&BHTopicBusAddress(), head, sub);
} else {
MsgI reply;
- DEFER1(reply.Release(shm()););
+ DEFER1(reply.Release(););
BHMsgHead reply_head;
return sock.SendAndRecv(&BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
@@ -515,7 +539,7 @@
auto &sock = SockSub();
MsgI msg;
- DEFER1(msg.Release(shm()););
+ DEFER1(msg.Release(););
BHMsgHead head;
//TODO error msg.
if (sock.SyncRecv(msg, head, timeout_ms) && head.type() == kMsgTypePublish) {
--
Gitblit v1.8.0