From 93b71a7989f678bf36f12333787a056559f29ccf Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期日, 25 四月 2021 10:21:39 +0800
Subject: [PATCH] remove failed msgq.
---
src/topic_node.cpp | 261 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 173 insertions(+), 88 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index e9e627f..00db773 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -32,39 +32,47 @@
std::string msg_id;
};
+const int kMqLen = 700;
+
} // namespace
TopicNode::TopicNode(SharedMemory &shm) :
- shm_(shm), sock_node_(shm), sock_request_(shm), sock_reply_(shm), sock_sub_(shm), registered_(false)
+ shm_(shm), sockets_(eSockEnd), state_(eStateUnregistered)
{
+ for (int i = eSockStart; i < eSockEnd; ++i) {
+ sockets_[i].reset(new ShmSocket(shm_, kMqLen));
+ }
// recv msgs to avoid memory leak.
auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
- SockNode().Start(default_ignore_msg);
+ for (auto &p : sockets_) {
+ p->Start(default_ignore_msg);
+ }
}
TopicNode::~TopicNode()
{
Stop();
SockNode().Stop();
+ if (state() == eStateUnregistered) {
+ for (auto &p : sockets_) { p->Remove(); }
+ }
}
-void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
+void TopicNode::Start(ServerAsyncCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
if (nworker < 1) {
nworker = 1;
} else if (nworker > 16) {
nworker = 16;
}
-
+ SockNode().Start();
ServerStart(server_cb, nworker);
SubscribeStartWorker(sub_cb, nworker);
ClientStartWorker(client_cb, nworker);
}
void TopicNode::Stop()
{
- SockSub().Stop();
- SockServer().Stop();
- SockClient().Stop();
+ for (auto &p : sockets_) { p->Stop(); }
}
bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
@@ -88,8 +96,11 @@
bool ok = head.type() == kMsgTypeCommonReply &&
msg.ParseBody(rbody) &&
IsSuccess(rbody.errmsg().errcode());
- printf("async regisered %s\n", ok ? "ok" : "failed");
- registered_.store(ok);
+ if (ok) {
+ state(eStateOnline);
+ } else {
+ state_cas(eStateOnline, eStateOffline);
+ }
};
if (timeout_ms == 0) {
@@ -100,19 +111,55 @@
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 IsRegistered();
+ 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);
}
}
bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
auto &sock = SockNode();
MsgHeartbeat body;
@@ -125,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);
@@ -140,9 +187,31 @@
return Heartbeat(proc, reply_body, timeout_ms);
}
+bool TopicNode::QueryTopicAddress(BHAddress &dest, 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)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
auto &sock = SockServer();
MsgRegisterRPC body;
@@ -155,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;
@@ -164,7 +233,7 @@
}
}
-bool TopicNode::ServerStart(const ServerCB &rcb, int nworker)
+bool TopicNode::ServerStart(const ServerSyncCB &rcb, int nworker)
{
auto onRecv = [this, rcb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
@@ -187,9 +256,29 @@
return rcb && sock.Start(onRecv, nworker);
}
+bool TopicNode::ServerStart(const ServerAsyncCB &acb, int nworker)
+{
+ auto onRecv = [this, acb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
+ if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
+ MsgRequestTopic req;
+ if (!imsg.ParseBody(req)) { return; }
+
+ SrcInfo *p = new SrcInfo;
+ p->route.assign(head.route().begin(), head.route().end());
+ p->msg_id = head.msg_id();
+ acb(p, *head.mutable_proc_id(), req);
+ };
+
+ auto &sock = SockServer();
+ return acb && sock.Start(onRecv, nworker);
+}
+
bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
auto &sock = SockServer();
@@ -210,7 +299,10 @@
bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
auto &sock = SockServer();
@@ -240,12 +332,15 @@
}
};
- return SockRequest().Start(onData, nworker);
+ 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 (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
const std::string &msg_id(NewMsgId());
@@ -273,41 +368,23 @@
};
try {
- auto &sock = SockClient();
BHAddress addr;
-
- if (topic_query_cache_.Find(req.topic(), addr)) {
- return SendTo(addr, req, cb);
- }
-
- 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_.Update(req.topic(), addr);
- SendTo(addr, req, cb);
- }
- }
- };
- return sock.Send(&BHTopicCenterAddress(), head, query, onQueryResult);
-
+ return (ClientQueryRPCTopic(req.topic(), addr, 3000)) && SendTo(addr, req, cb);
} 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 (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
try {
- auto &sock = SockRequest();
+ auto &sock = SockClient();
BHAddress addr;
if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
@@ -316,59 +393,58 @@
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) && 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)
+int TopicNode::QueryRPCTopics(const Topic &topic, std::vector<NodeAddress> &addr, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ int n = 0;
+ MsgQueryTopic query;
+ query.set_topic(topic);
+ MsgQueryTopicReply rep;
+ BHAddress dest; // empty means local.
+ if (QueryTopicAddress(dest, query, rep, timeout_ms)) {
+ auto &ls = rep.node_address();
+ n = ls.size();
+ for (auto &na : ls) {
+ addr.push_back(na);
+ }
+ }
+ return n;
+}
- auto &sock = SockRequest();
+bool TopicNode::ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms)
+{
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
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_.Update(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;
}
@@ -377,7 +453,10 @@
bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
try {
auto &sock = SockPub();
@@ -388,7 +467,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) &&
@@ -405,7 +484,10 @@
bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
try {
auto &sock = SockSub();
@@ -418,7 +500,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 &&
@@ -451,11 +533,14 @@
bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
{
- if (!IsRegistered()) { return false; }
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
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