From c64c54d8e75b9354dc49a7b6b2d326e7dd59eb37 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 15 四月 2021 19:32:16 +0800
Subject: [PATCH] add api; fix send, socknode mem leak.
---
src/topic_node.cpp | 318 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 197 insertions(+), 121 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 8cd5cc4..e9e627f 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -17,7 +17,6 @@
*/
#include "topic_node.h"
#include "bh_util.h"
-#include "failed_msg.h"
#include <chrono>
#include <list>
@@ -33,34 +32,48 @@
std::string msg_id;
};
-typedef FailedMsgQ ServerFailedQ;
-
} // namespace
+
TopicNode::TopicNode(SharedMemory &shm) :
- shm_(shm), sock_node_(shm), sock_request_(shm), sock_reply_(shm), sock_sub_(shm)
+ shm_(shm), sock_node_(shm), sock_request_(shm), sock_reply_(shm), sock_sub_(shm), registered_(false)
{
- SockNode().Start();
- SockClient().Start();
- SockServer().Start();
+ // recv msgs to avoid memory leak.
+ auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
+ SockNode().Start(default_ignore_msg);
}
TopicNode::~TopicNode()
{
- StopAll();
+ Stop();
+ SockNode().Stop();
}
-void TopicNode::StopAll()
+void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
+ if (nworker < 1) {
+ nworker = 1;
+ } else if (nworker > 16) {
+ nworker = 16;
+ }
+
+ ServerStart(server_cb, nworker);
+ SubscribeStartWorker(sub_cb, nworker);
+ ClientStartWorker(client_cb, nworker);
+}
+void TopicNode::Stop()
+{
+ SockSub().Stop();
SockServer().Stop();
SockClient().Stop();
- SockNode().Stop();
}
bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ info_ = proc;
+
auto &sock = SockNode();
MsgRegister body;
- *body.mutable_proc() = proc;
+ body.mutable_proc()->Swap(&proc);
auto AddId = [&](const MQId &id) { body.add_addrs()->set_mq_id(&id, sizeof(id)); };
AddId(SockNode().id());
AddId(SockServer().id());
@@ -71,20 +84,66 @@
auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
AddRoute(head, sock.id());
- MsgI reply;
- DEFER1(reply.Release(shm_););
- 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);
- if (r) {
- info_ = body;
+ auto CheckResult = [this](MsgI &msg, BHMsgHead &head, MsgCommonReply &rbody) {
+ bool ok = head.type() == kMsgTypeCommonReply &&
+ msg.ParseBody(rbody) &&
+ IsSuccess(rbody.errmsg().errcode());
+ printf("async regisered %s\n", ok ? "ok" : "failed");
+ registered_.store(ok);
+ };
+
+ 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(shm_););
+ 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 r;
+}
+
+bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
+{
+ if (!IsRegistered()) { return false; }
+
+ auto &sock = SockNode();
+ MsgHeartbeat body;
+ body.mutable_proc()->Swap(&proc);
+
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ AddRoute(head, sock.id());
+
+ if (timeout_ms == 0) {
+ return sock.Send(&BHTopicCenterAddress(), head, body);
+ } else {
+ MsgI reply;
+ DEFER1(reply.Release(shm_););
+ 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);
+ return (r && IsSuccess(reply_body.errmsg().errcode()));
+ }
+}
+bool TopicNode::Heartbeat(const int timeout_ms)
+{
+ ProcInfo proc;
+ proc.set_proc_id(proc_id());
+ MsgCommonReply reply_body;
+ return Heartbeat(proc, reply_body, timeout_ms);
}
bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
- //TODO check registered
+ if (!IsRegistered()) { return false; }
+
auto &sock = SockServer();
MsgRegisterRPC body;
body.mutable_topics()->Swap(&topics);
@@ -92,67 +151,53 @@
auto head(InitMsgHead(GetType(body), proc_id()));
AddRoute(head, sock.id());
- MsgI reply;
- DEFER1(reply.Release(shm_););
- BHMsgHead reply_head;
- bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
- r = r && reply_head.type() == kMsgTypeCommonReply;
- r = r && reply.ParseBody(reply_body);
- return r;
+ if (timeout_ms == 0) {
+ return sock.Send(&BHTopicCenterAddress(), head, body);
+ } else {
+ MsgI reply;
+ DEFER1(reply.Release(shm_););
+ BHMsgHead reply_head;
+ bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ r = r && reply_head.type() == kMsgTypeCommonReply;
+ r = r && reply.ParseBody(reply_body);
+ return r;
+ }
}
-bool TopicNode::ServerStart(const OnRequest &rcb, int nworker)
+bool TopicNode::ServerStart(const ServerCB &rcb, int nworker)
{
- //TODO check registered
+ auto onRecv = [this, rcb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
+ if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
+ MsgRequestTopic req;
+ if (!imsg.ParseBody(req)) { return; }
- auto failed_q = std::make_shared<ServerFailedQ>();
+ MsgRequestTopicReply reply_body;
+ if (rcb(head.proc_id(), req, reply_body)) {
+ BHMsgHead reply_head(InitMsgHead(GetType(reply_body), proc_id(), head.msg_id()));
- auto onIdle = [failed_q](ShmSocket &socket) { failed_q->TrySend(socket); };
-
- auto onRecv = [this, rcb, failed_q, onIdle](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
- if (head.type() == kMsgTypeRequestTopic && head.route_size() > 0) {
- MsgRequestTopic req;
- if (imsg.ParseBody(req)) {
- std::string out;
- if (rcb(req.topic(), req.data(), out)) {
- MsgRequestTopicReply reply_body;
- reply_body.set_data(std::move(out));
- BHMsgHead reply_head(InitMsgHead(GetType(reply_body), proc_id(), head.msg_id()));
-
- for (int i = 0; i < head.route_size() - 1; ++i) {
- reply_head.add_route()->Swap(head.mutable_route(i));
- }
- MsgI msg;
- if (msg.Make(sock.shm(), reply_head, reply_body)) {
- auto &remote = head.route().rbegin()->mq_id();
- if (!sock.Send(remote.data(), msg, 10)) {
- failed_q->Push(remote, msg, 10s);
- }
- }
- }
+ for (int i = 0; i < head.route_size() - 1; ++i) {
+ reply_head.add_route()->Swap(head.mutable_route(i));
}
- } else {
- // ignored, or dropped
+ auto &remote = head.route().rbegin()->mq_id();
+ sock.Send(remote.data(), reply_head, reply_body);
}
-
- onIdle(sock);
};
auto &sock = SockServer();
- return rcb && sock.Start(onRecv, onIdle, nworker);
+ return rcb && sock.Start(onRecv, nworker);
}
-bool TopicNode::ServerRecvRequest(void *&src_info, std::string &topic, std::string &data, const int timeout_ms)
+bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
auto &sock = SockServer();
MsgI imsg;
BHMsgHead head;
if (sock.SyncRecv(imsg, head, timeout_ms) && head.type() == kMsgTypeRequestTopic) {
- MsgRequestTopic request;
if (imsg.ParseBody(request)) {
- request.mutable_topic()->swap(topic);
- request.mutable_data()->swap(data);
+ head.mutable_proc_id()->swap(proc_id);
SrcInfo *p = new SrcInfo;
p->route.assign(head.route().begin(), head.route().end());
p->msg_id = head.msg_id();
@@ -163,8 +208,10 @@
return false;
}
-bool TopicNode::ServerSendReply(void *src_info, const std::string &data, const int timeout_ms)
+bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
{
+ if (!IsRegistered()) { return false; }
+
auto &sock = SockServer();
SrcInfo *p = static_cast<SrcInfo *>(src_info);
@@ -172,15 +219,11 @@
if (!p || p->route.empty()) {
return false;
}
- MsgRequestTopicReply body;
- body.set_data(data);
BHMsgHead head(InitMsgHead(GetType(body), proc_id(), p->msg_id));
-
for (unsigned i = 0; i < p->route.size() - 1; ++i) {
head.add_route()->Swap(&p->route[i]);
}
-
- return sock.Send(p->route.back().mq_id().data(), head, body, timeout_ms);
+ return sock.Send(p->route.back().mq_id().data(), head, body);
}
bool TopicNode::ClientStartWorker(RequestResultCB const &cb, const int nworker)
@@ -192,7 +235,7 @@
if (head.type() == kMsgTypeRequestTopicReply) {
MsgRequestTopicReply reply;
if (imsg.ParseBody(reply)) {
- cb(reply.data());
+ cb(head, reply);
}
}
};
@@ -200,75 +243,92 @@
return SockRequest().Start(onData, nworker);
}
-bool TopicNode::ClientAsyncRequest(const Topic &topic, const void *data, const size_t size, const int timeout_ms, const RequestResultCB &cb)
+bool TopicNode::ClientAsyncRequest(const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
{
- auto Call = [&](const void *remote) {
- auto &sock = SockRequest();
+ if (!IsRegistered()) { return false; }
- MsgRequestTopic req;
- req.set_topic(topic);
- req.set_data(data, size);
- BHMsgHead head(InitMsgHead(GetType(req), proc_id()));
+ const std::string &msg_id(NewMsgId());
+
+ out_msg_id = msg_id;
+
+ auto SendTo = [this, msg_id](const BHAddress &addr, const MsgRequestTopic &req, const RequestResultCB &cb) {
+ auto &sock = SockClient();
+ BHMsgHead head(InitMsgHead(GetType(req), proc_id(), msg_id));
AddRoute(head, sock.id());
+ head.set_topic(req.topic());
if (cb) {
auto onRecv = [cb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
if (head.type() == kMsgTypeRequestTopicReply) {
MsgRequestTopicReply reply;
if (imsg.ParseBody(reply)) {
- cb(reply.data());
+ cb(head, reply);
}
}
};
- return sock.Send(remote, head, req, timeout_ms, onRecv);
+ return sock.Send(addr.mq_id().data(), head, req, onRecv);
} else {
- return sock.Send(remote, head, req, timeout_ms);
+ return sock.Send(addr.mq_id().data(), head, req);
}
};
try {
+ auto &sock = SockClient();
BHAddress addr;
- if (ClientQueryRPCTopic(topic, addr, timeout_ms)) {
- return Call(addr.mq_id().data());
- } else {
- return false;
+
+ 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);
+
} catch (...) {
return false;
}
}
-bool TopicNode::ClientSyncRequest(const Topic &topic, const void *data, const size_t size, std::string &out, const int timeout_ms)
+bool TopicNode::ClientSyncRequest(const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
try {
auto &sock = SockRequest();
BHAddress addr;
- if (ClientQueryRPCTopic(topic, addr, timeout_ms)) {
-
- MsgRequestTopic req;
- req.set_topic(topic);
- req.set_data(data, size);
- BHMsgHead head(InitMsgHead(GetType(req), proc_id()));
+ if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
+ BHMsgHead head(InitMsgHead(GetType(request), proc_id()));
AddRoute(head, sock.id());
+ head.set_topic(request.topic());
- MsgI reply;
- DEFER1(reply.Release(shm_););
+ MsgI reply_msg;
+ DEFER1(reply_msg.Release(shm_););
BHMsgHead reply_head;
- if (sock.SendAndRecv(addr.mq_id().data(), head, req, reply, reply_head, timeout_ms) && reply_head.type() == kMsgTypeRequestTopicReply) {
- MsgRequestTopicReply dr;
- if (reply.ParseBody(dr)) {
- dr.mutable_data()->swap(out);
+ 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");
}
- } else {
- printf("error recv data. line: %d\n", __LINE__);
}
} else {
- printf("error recv data. line: %d\n", __LINE__);
+ SetLastError(eNotFound, "remote not found.");
}
} catch (...) {
printf("error recv data. line: %d\n", __LINE__);
@@ -278,6 +338,8 @@
bool TopicNode::ClientQueryRPCTopic(const Topic &topic, bhome::msg::BHAddress &addr, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
auto &sock = SockRequest();
if (topic_query_cache_.Find(topic, addr)) {
@@ -313,25 +375,27 @@
// publish
-bool TopicNode::Publish(const Topic &topic, const void *data, const size_t size, const int timeout_ms)
+bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
try {
auto &sock = SockPub();
-
- MsgPublish pub;
- pub.set_topic(topic);
- pub.set_data(data, size);
BHMsgHead head(InitMsgHead(GetType(pub), proc_id()));
AddRoute(head, sock.id());
- MsgI reply;
- DEFER1(reply.Release(shm()););
- BHMsgHead reply_head;
- MsgCommonReply reply_body;
- return sock.SendAndRecv(&BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
- reply_head.type() == kMsgTypeCommonReply &&
- reply.ParseBody(reply_body) &&
- IsSuccess(reply_body.errmsg().errcode());
+ if (timeout_ms == 0) {
+ return sock.Send(&BHTopicBusAddress(), head, pub);
+ } else {
+ MsgI reply;
+ DEFER1(reply.Release(shm()););
+ BHMsgHead reply_head;
+ MsgCommonReply reply_body;
+ return sock.SendAndRecv(&BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
+ reply_head.type() == kMsgTypeCommonReply &&
+ reply.ParseBody(reply_body) &&
+ IsSuccess(reply_body.errmsg().errcode());
+ }
} catch (...) {
}
return false;
@@ -339,8 +403,10 @@
// subscribe
-bool TopicNode::Subscribe(MsgTopicList &topics, const int timeout_ms)
+bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
try {
auto &sock = SockSub();
MsgSubscribe sub;
@@ -348,14 +414,24 @@
BHMsgHead head(InitMsgHead(GetType(sub), proc_id()));
AddRoute(head, sock.id());
-
- return sock.Send(&BHTopicBusAddress(), head, sub, timeout_ms);
+ if (timeout_ms == 0) {
+ return sock.Send(&BHTopicBusAddress(), head, sub);
+ } else {
+ MsgI reply;
+ DEFER1(reply.Release(shm()););
+ BHMsgHead reply_head;
+ return sock.SendAndRecv(&BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
+ reply_head.type() == kMsgTypeCommonReply &&
+ reply.ParseBody(reply_body) &&
+ IsSuccess(reply_body.errmsg().errcode());
+ }
+ // TODO wait for result?
} catch (...) {
return false;
}
}
-bool TopicNode::SubscribeStartWorker(const TopicDataCB &tdcb, int nworker)
+bool TopicNode::SubscribeStartWorker(const SubDataCB &tdcb, int nworker)
{
auto &sock = SockSub();
@@ -363,7 +439,7 @@
if (head.type() == kMsgTypePublish) {
MsgPublish pub;
if (imsg.ParseBody(pub)) {
- tdcb(head.proc_id(), pub.topic(), pub.data());
+ tdcb(head.proc_id(), pub);
}
} else {
// ignored, or dropped
@@ -373,18 +449,18 @@
return tdcb && sock.Start(AsyncRecvProc, nworker);
}
-bool TopicNode::RecvSub(std::string &proc_id, Topic &topic, std::string &data, const int timeout_ms)
+bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
{
+ if (!IsRegistered()) { return false; }
+
auto &sock = SockSub();
MsgI msg;
DEFER1(msg.Release(shm()););
BHMsgHead head;
+ //TODO error msg.
if (sock.SyncRecv(msg, head, timeout_ms) && head.type() == kMsgTypePublish) {
- MsgPublish pub;
if (msg.ParseBody(pub)) {
head.mutable_proc_id()->swap(proc_id);
- pub.mutable_topic()->swap(topic);
- pub.mutable_data()->swap(data);
return true;
}
}
--
Gitblit v1.8.0