From 77a6c3512a44dfe6540dde71946e6484fe4f173f Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 10 五月 2021 16:05:28 +0800
Subject: [PATCH] test lock code.
---
src/topic_node.cpp | 168 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 60 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 24bc4bb..d8d6a42 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -23,9 +23,12 @@
using namespace std::chrono;
using namespace std::chrono_literals;
+const char *const kErrMsgNotInit = "BHome node NOT initialized.";
+const char *const kErrMsgNotRegistered = "BHome node NOT registered.";
+
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;
@@ -37,29 +40,61 @@
} // namespace
TopicNode::TopicNode(SharedMemory &shm) :
- shm_(shm), sockets_(eSockEnd), state_(eStateUnregistered)
+ shm_(shm), 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; };
- for (auto &p : sockets_) {
- p->Start(default_ignore_msg);
- }
+ Init();
}
TopicNode::~TopicNode()
{
+ LOG_DEBUG() << "~TopicNode()";
Stop();
- SockNode().Stop();
- if (state() == eStateUnregistered) {
- for (auto &p : sockets_) { p->Remove(); }
+}
+
+bool TopicNode::Init()
+{
+ std::lock_guard<std::mutex> lk(mutex_);
+
+ if (Valid()) {
+ return true;
}
+
+ if (ssn_id_ == 0) {
+ ssn_id_ = ShmMsgQueue::NewId();
+ }
+ LOG_DEBUG() << "Node Init, id " << ssn_id_;
+ MsgI msg;
+ msg.OffsetRef() = ssn_id_;
+ if (ShmMsgQueue::TrySend(shm(), BHInitAddress(), msg)) {
+
+ auto end_time = steady_clock::now() + 3s;
+ do {
+ try {
+ for (int i = eSockStart; i < eSockEnd; ++i) {
+ sockets_.emplace_back(new ShmSocket(shm_, false, ssn_id_ + i, kMqLen));
+ }
+ break;
+ } catch (...) {
+ sockets_.clear();
+ std::this_thread::sleep_for(100ms);
+ }
+ } while (steady_clock::now() < end_time);
+ if (!sockets_.empty()) {
+ // recv msgs to avoid memory leak.
+ auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
+ SockNode().Start(default_ignore_msg);
+ return true;
+ }
+ }
+ return false;
}
void TopicNode::Start(ServerAsyncCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
+ if (!Init()) {
+ SetLastError(eError, kErrMsgNotInit);
+ return;
+ }
if (nworker < 1) {
nworker = 1;
} else if (nworker > 16) {
@@ -72,24 +107,31 @@
}
void TopicNode::Stop()
{
+ LOG_DEBUG() << "Node Stopping";
for (auto &p : sockets_) { p->Stop(); }
+ LOG_INFO() << "Node Stopped";
}
bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!Init()) {
+ SetLastError(eError, kErrMsgNotInit);
+ return false;
+ }
+
info_ = proc;
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 +150,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);
}
@@ -122,6 +164,11 @@
}
bool TopicNode::Unregister(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
+ return false;
+ }
+
info_.Clear();
state_cas(eStateOnline, eStateOffline);
@@ -129,7 +176,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 +191,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);
}
}
@@ -157,7 +204,7 @@
bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -165,16 +212,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()));
}
@@ -187,21 +234,21 @@
return Heartbeat(proc, reply_body, timeout_ms);
}
-bool TopicNode::QueryTopicAddress(MsgQueryTopic &query, MsgQueryTopicReply &reply_body, const int timeout_ms)
+bool TopicNode::QueryTopicAddress(BHAddress &dest, MsgQueryTopic &query, MsgQueryTopicReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
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));
}
@@ -209,7 +256,7 @@
bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -217,16 +264,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 +289,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);
}
};
@@ -276,7 +323,7 @@
bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -300,7 +347,7 @@
bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -311,11 +358,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)
@@ -338,7 +385,7 @@
bool TopicNode::ClientAsyncRequest(const BHAddress &remote_addr, const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -348,7 +395,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 +408,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);
}
};
@@ -379,7 +426,7 @@
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.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -388,7 +435,8 @@
BHAddress addr;
if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
- BHMsgHead head(InitMsgHead(GetType(request), proc_id()));
+ LOG_TRACE() << "node: " << SockNode().id() << ", topic dest: " << addr.mq_id();
+ BHMsgHead head(InitMsgHead(GetType(request), proc_id(), ssn()));
AddRoute(head, sock.id());
head.set_topic(request.topic());
@@ -396,14 +444,12 @@
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);
return true;
}
- } else {
- SetLastError(eNotFound, "remote not found.");
}
} catch (...) {
SetLastError(eError, __func__ + std::string(" internal errer."));
@@ -417,7 +463,8 @@
MsgQueryTopic query;
query.set_topic(topic);
MsgQueryTopicReply rep;
- if (QueryTopicAddress(query, rep, timeout_ms)) {
+ BHAddress dest; // empty means local.
+ if (QueryTopicAddress(dest, query, rep, timeout_ms)) {
auto &ls = rep.node_address();
n = ls.size();
for (auto &na : ls) {
@@ -430,7 +477,7 @@
bool TopicNode::ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -440,11 +487,12 @@
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;
}
}
+ SetLastError(eNotFound, "remote not found.");
return false;
}
@@ -453,23 +501,23 @@
bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
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());
@@ -484,7 +532,7 @@
bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -493,15 +541,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());
@@ -533,7 +581,7 @@
bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
--
Gitblit v1.8.0