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 | 491 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 337 insertions(+), 154 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index c6c9771..2cc5483 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -32,141 +32,189 @@
std::string msg_id;
};
-class ServerFailedQ
-{
- struct FailedMsg {
- steady_clock::time_point xpr;
- std::string remote_;
- BHMsgHead head_;
- MsgRequestTopicReply body_;
- FailedMsg(const std::string &addr, BHMsgHead &&head, MsgRequestTopicReply &&body) :
- xpr(steady_clock::now() + 10s), remote_(addr), head_(std::move(head)), body_(std::move(body)) {}
- bool Expired() { return steady_clock::now() > xpr; }
- };
- typedef std::list<FailedMsg> Queue;
- Synced<Queue> queue_;
-
-public:
- void Push(const std::string &remote, BHMsgHead &&head, MsgRequestTopicReply &&body)
- {
- queue_->emplace_back(remote, std::move(head), std::move(body));
- }
- void TrySend(ShmSocket &socket, const int timeout_ms = 0)
- {
- queue_.Apply([&](Queue &q) {
- if (!q.empty()) {
- auto it = q.begin();
- do {
- if (it->Expired()) {
- // it->msg_.Release(socket.shm());
- it = q.erase(it);
- } else if (socket.Send(it->remote_.data(), it->head_, it->body_, timeout_ms)) {
- it = q.erase(it);
- } else {
- ++it;
- }
- } while (it != q.end());
- }
- });
- }
-};
-
} // 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_client_(shm), sock_server_(shm), sock_sub_(shm), registered_(false), registered_ever_(false)
{
- SockNode().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()
-{
- ServerStop();
- ClientStopWorker();
-}
-
-bool TopicNode::Register(const MsgRegister &body, MsgCommonReply &reply_body, const int timeout_ms)
-{
- auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
- AddRoute(head, SockNode().id());
-
- MsgI reply;
- DEFER1(reply.Release(shm_););
- BHMsgHead reply_head;
- bool r = SockNode().SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
- r = r && reply_head.type() == kMsgTypeCommonReply;
- r = r && reply.ParseBody(reply_body);
- if (r) {
- info_ = body;
+ if (!registered_ever_) {
+ SockNode().Remove();
+ SockClient().Remove();
+ SockServer().Remove();
+ SockSub().Remove();
}
- return r;
}
-bool TopicNode::RegisterRPC(const MsgRegisterRPC &body, MsgCommonReply &reply_body, const int timeout_ms)
+void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
- //TODO check registered
+ if (nworker < 1) {
+ nworker = 1;
+ } else if (nworker > 16) {
+ nworker = 16;
+ }
- auto head(InitMsgHead(GetType(body), proc_id()));
- AddRoute(head, SockReply().id());
-
- MsgI reply;
- DEFER1(reply.Release(shm_););
- BHMsgHead reply_head;
- bool r = SockReply().SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
- r = r && reply_head.type() == kMsgTypeCommonReply;
- r = r && reply.ParseBody(reply_body);
- return r;
+ ServerStart(server_cb, nworker);
+ SubscribeStartWorker(sub_cb, nworker);
+ ClientStartWorker(client_cb, nworker);
+}
+void TopicNode::Stop()
+{
+ SockSub().Stop();
+ SockServer().Stop();
+ SockClient().Stop();
}
-bool TopicNode::ServerStart(const OnRequest &rcb, int nworker)
+bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
- //TODO check registered
+ info_ = proc;
- auto failed_q = std::make_shared<ServerFailedQ>();
+ auto &sock = SockNode();
+ MsgRegister body;
+ 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());
+ AddId(SockClient().id());
+ AddId(SockSub().id());
+ AddId(SockPub().id());
- auto onIdle = [failed_q](ShmSocket &socket) { failed_q->TrySend(socket); };
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ AddRoute(head, sock.id());
- 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));
- }
- if (!sock.Send(head.route().rbegin()->mq_id().data(), reply_head, reply_body, 10)) {
- failed_q->Push(head.route().rbegin()->mq_id(), std::move(reply_head), std::move(reply_body));
- }
- }
- }
- } else {
- // ignored, or dropped
+ auto CheckResult = [this](MsgI &msg, BHMsgHead &head, MsgCommonReply &rbody) {
+ bool ok = head.type() == kMsgTypeCommonReply &&
+ msg.ParseBody(rbody) &&
+ IsSuccess(rbody.errmsg().errcode());
+ if (ok) {
+ registered_ever_.store(true);
}
-
- onIdle(sock);
+ registered_.store(ok);
};
- return rcb && SockReply().Start(onRecv, onIdle, nworker);
+ 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();
+ }
}
-bool TopicNode::ServerStop() { return SockReply().Stop(); }
-bool TopicNode::ServerRecvRequest(void *&src_info, std::string &topic, std::string &data, const int timeout_ms)
+bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ 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)
+{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ auto &sock = SockServer();
+ MsgRegisterRPC body;
+ body.mutable_topics()->Swap(&topics);
+
+ auto head(InitMsgHead(GetType(body), 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;
+ r = r && reply.ParseBody(reply_body);
+ return r;
+ }
+}
+
+bool TopicNode::ServerStart(const ServerCB &rcb, int nworker)
+{
+ 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; }
+
+ MsgRequestTopicReply reply_body;
+ if (rcb(head.proc_id(), req, reply_body)) {
+ 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));
+ }
+ auto &remote = head.route().rbegin()->mq_id();
+ sock.Send(remote.data(), reply_head, reply_body);
+ }
+ };
+
+ auto &sock = SockServer();
+ return rcb && sock.Start(onRecv, nworker);
+}
+
+bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
+{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ auto &sock = SockServer();
+
MsgI imsg;
BHMsgHead head;
- if (SockReply().SyncRecv(imsg, head, timeout_ms) && head.type() == kMsgTypeRequestTopic) {
- MsgRequestTopic request;
+ if (sock.SyncRecv(imsg, head, timeout_ms) && head.type() == kMsgTypeRequestTopic) {
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();
@@ -177,22 +225,25 @@
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()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ auto &sock = SockServer();
+
SrcInfo *p = static_cast<SrcInfo *>(src_info);
DEFER1(delete p);
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 SockReply().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)
@@ -204,92 +255,121 @@
if (head.type() == kMsgTypeRequestTopicReply) {
MsgRequestTopicReply reply;
if (imsg.ParseBody(reply)) {
- cb(reply.data());
+ cb(head, reply);
}
}
};
- return SockRequest().Start(onData, nworker);
+ return SockClient().Start(onData, nworker);
}
-bool TopicNode::ClientStopWorker() { return SockRequest().Stop(); }
-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();
- MsgRequestTopic req;
- req.set_topic(topic);
- req.set_data(data, size);
- BHMsgHead head(InitMsgHead(GetType(req), proc_id()));
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ 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 (...) {
+ SetLastError(eError, "internal error.");
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()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
try {
- auto &sock = SockRequest();
+ auto &sock = SockClient();
+
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);
- return true;
- } else {
- printf("error parse reply.\n");
- }
- } else {
- printf("error recv data. line: %d\n", __LINE__);
+ 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 {
- printf("error recv data. line: %d\n", __LINE__);
+ 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)
{
- auto &sock = SockRequest();
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ auto &sock = SockClient();
+
if (topic_query_cache_.Find(topic, addr)) {
return true;
}
@@ -319,4 +399,107 @@
} else {
}
return false;
+}
+
+// publish
+
+bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
+{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ try {
+ auto &sock = SockPub();
+ BHMsgHead head(InitMsgHead(GetType(pub), proc_id()));
+ AddRoute(head, sock.id());
+
+ 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;
+}
+
+// subscribe
+
+bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ return false;
+ }
+
+ try {
+ auto &sock = SockSub();
+ MsgSubscribe sub;
+ sub.mutable_topics()->Swap(&topics);
+
+ BHMsgHead head(InitMsgHead(GetType(sub), proc_id()));
+ AddRoute(head, sock.id());
+ 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 SubDataCB &tdcb, int nworker)
+{
+ auto &sock = SockSub();
+
+ auto AsyncRecvProc = [this, tdcb](ShmSocket &, MsgI &imsg, BHMsgHead &head) {
+ if (head.type() == kMsgTypePublish) {
+ MsgPublish pub;
+ if (imsg.ParseBody(pub)) {
+ tdcb(head.proc_id(), pub);
+ }
+ } else {
+ // ignored, or dropped
+ }
+ };
+
+ return tdcb && sock.Start(AsyncRecvProc, nworker);
+}
+
+bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
+{
+ if (!IsRegistered()) {
+ SetLastError(eNotRegistered, "Not Registered.");
+ 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) {
+ if (msg.ParseBody(pub)) {
+ head.mutable_proc_id()->swap(proc_id);
+ return true;
+ }
+ }
+ return false;
}
\ No newline at end of file
--
Gitblit v1.8.0