From a6f67b4249525089fb97eb9418c7014f66c2a000 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 28 四月 2021 19:29:17 +0800
Subject: [PATCH] use new robust mutex, circurar; rm timeout mutex.
---
src/topic_node.cpp | 74 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 00db773..d274c4b 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -25,7 +25,7 @@
namespace
{
-inline void AddRoute(BHMsgHead &head, const MQId &id) { head.add_route()->set_mq_id(&id, sizeof(id)); }
+inline void AddRoute(BHMsgHead &head, const MQId id) { head.add_route()->set_mq_id(id); }
struct SrcInfo {
std::vector<BHAddress> route;
@@ -44,9 +44,10 @@
}
// recv msgs to avoid memory leak.
auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
- for (auto &p : sockets_) {
- p->Start(default_ignore_msg);
- }
+ SockNode().Start(default_ignore_msg);
+ // for (auto &p : sockets_) {
+ // p->Start(default_ignore_msg);
+ // }
}
TopicNode::~TopicNode()
@@ -82,14 +83,14 @@
auto &sock = SockNode();
MsgRegister body;
body.mutable_proc()->Swap(&proc);
- auto AddId = [&](const MQId &id) { body.add_addrs()->set_mq_id(&id, sizeof(id)); };
+ auto AddId = [&](const MQId id) { body.add_addrs()->set_mq_id(id); };
AddId(SockNode().id());
AddId(SockServer().id());
AddId(SockClient().id());
AddId(SockSub().id());
AddId(SockPub().id());
- auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id(), ssn()));
AddRoute(head, sock.id());
auto CheckResult = [this](MsgI &msg, BHMsgHead &head, MsgCommonReply &rbody) {
@@ -108,12 +109,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(&BHTopicCenterAddress(), head, body, onResult);
+ 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);
+ bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
if (r) {
CheckResult(reply, reply_head, reply_body);
}
@@ -129,7 +130,7 @@
MsgUnregister body;
body.mutable_proc()->Swap(&proc);
- auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id(), ssn()));
AddRoute(head, sock.id());
auto CheckResult = [this](MsgI &msg, BHMsgHead &head, MsgCommonReply &rbody) {
@@ -144,12 +145,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(&BHTopicCenterAddress(), head, body, onResult);
+ 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);
+ bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
return r && CheckResult(reply, reply_head, reply_body);
}
}
@@ -165,16 +166,16 @@
MsgHeartbeat body;
body.mutable_proc()->Swap(&proc);
- auto head(InitMsgHead(GetType(body), body.proc().proc_id()));
+ auto head(InitMsgHead(GetType(body), body.proc().proc_id(), ssn()));
AddRoute(head, sock.id());
if (timeout_ms == 0) {
- return sock.Send(&BHTopicCenterAddress(), head, body);
+ return sock.Send(BHTopicCenterAddress(), head, body);
} else {
MsgI reply;
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ 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()));
}
@@ -195,13 +196,13 @@
}
auto &sock = SockNode();
- BHMsgHead head(InitMsgHead(GetType(query), proc_id()));
+ BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
AddRoute(head, sock.id());
MsgI reply;
DEFER1(reply.Release());
BHMsgHead reply_head;
- return (sock.SendAndRecv(&BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
+ return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeQueryTopicReply &&
reply.ParseBody(reply_body));
}
@@ -217,16 +218,16 @@
MsgRegisterRPC body;
body.mutable_topics()->Swap(&topics);
- auto head(InitMsgHead(GetType(body), proc_id()));
+ auto head(InitMsgHead(GetType(body), proc_id(), ssn()));
AddRoute(head, sock.id());
if (timeout_ms == 0) {
- return sock.Send(&BHTopicCenterAddress(), head, body);
+ return sock.Send(BHTopicCenterAddress(), head, body);
} else {
MsgI reply;
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(&BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ 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;
@@ -242,13 +243,13 @@
MsgRequestTopicReply reply_body;
if (rcb(head.proc_id(), req, reply_body)) {
- BHMsgHead reply_head(InitMsgHead(GetType(reply_body), proc_id(), head.msg_id()));
+ BHMsgHead reply_head(InitMsgHead(GetType(reply_body), proc_id(), ssn(), 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 remote = head.route().rbegin()->mq_id();
+ sock.Send(remote, reply_head, reply_body);
}
};
@@ -311,11 +312,11 @@
if (!p || p->route.empty()) {
return false;
}
- BHMsgHead head(InitMsgHead(GetType(body), proc_id(), p->msg_id));
+ BHMsgHead head(InitMsgHead(GetType(body), proc_id(), ssn(), 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);
+ return sock.Send(p->route.back().mq_id(), head, body);
}
bool TopicNode::ClientStartWorker(RequestResultCB const &cb, const int nworker)
@@ -348,7 +349,7 @@
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));
+ BHMsgHead head(InitMsgHead(GetType(req), proc_id(), ssn(), msg_id));
AddRoute(head, sock.id());
head.set_topic(req.topic());
@@ -361,9 +362,9 @@
}
}
};
- return sock.Send(addr.mq_id().data(), head, req, onRecv);
+ return sock.Send(addr.mq_id(), head, req, onRecv);
} else {
- return sock.Send(addr.mq_id().data(), head, req);
+ return sock.Send(addr.mq_id(), head, req);
}
};
@@ -388,7 +389,8 @@
BHAddress addr;
if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
- BHMsgHead head(InitMsgHead(GetType(request), proc_id()));
+ // printf("node: %ld, topic dest: %ld\n", SockNode().id(), addr.mq_id());
+ BHMsgHead head(InitMsgHead(GetType(request), proc_id(), ssn()));
AddRoute(head, sock.id());
head.set_topic(request.topic());
@@ -396,7 +398,7 @@
DEFER1(reply_msg.Release(););
BHMsgHead reply_head;
- if (sock.SendAndRecv(addr.mq_id().data(), head, request, reply_msg, reply_head, timeout_ms) &&
+ if (sock.SendAndRecv(addr.mq_id(), 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);
@@ -441,7 +443,7 @@
std::vector<NodeAddress> lst;
if (QueryRPCTopics(topic, lst, timeout_ms)) {
addr = lst.front().addr();
- if (!addr.mq_id().empty()) {
+ if (addr.mq_id() != 0) {
topic_query_cache_.Store(topic, addr);
return true;
}
@@ -460,17 +462,17 @@
try {
auto &sock = SockPub();
- BHMsgHead head(InitMsgHead(GetType(pub), proc_id()));
+ BHMsgHead head(InitMsgHead(GetType(pub), proc_id(), ssn()));
AddRoute(head, sock.id());
if (timeout_ms == 0) {
- return sock.Send(&BHTopicBusAddress(), head, pub);
+ return sock.Send(BHTopicBusAddress(), head, pub);
} else {
MsgI reply;
DEFER1(reply.Release(););
BHMsgHead reply_head;
MsgCommonReply reply_body;
- return sock.SendAndRecv(&BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
@@ -494,15 +496,15 @@
MsgSubscribe sub;
sub.mutable_topics()->Swap(&topics);
- BHMsgHead head(InitMsgHead(GetType(sub), proc_id()));
+ BHMsgHead head(InitMsgHead(GetType(sub), proc_id(), ssn()));
AddRoute(head, sock.id());
if (timeout_ms == 0) {
- return sock.Send(&BHTopicBusAddress(), head, sub);
+ return sock.Send(BHTopicBusAddress(), head, sub);
} else {
MsgI reply;
DEFER1(reply.Release(););
BHMsgHead reply_head;
- return sock.SendAndRecv(&BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
--
Gitblit v1.8.0