From db322f33ba13592f2492317e3f1a070454c97059 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 13 五月 2021 19:34:46 +0800
Subject: [PATCH] center alloc all msgs.
---
src/topic_node.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 27 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 3883062..35228b4 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -23,6 +23,9 @@
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); }
@@ -39,7 +42,6 @@
TopicNode::TopicNode(SharedMemory &shm) :
shm_(shm), state_(eStateUnregistered)
{
- Init();
}
TopicNode::~TopicNode()
@@ -54,22 +56,78 @@
if (Valid()) {
return true;
+ } else if (info_.proc_id().empty()) {
+ return false;
}
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)) {
- sockets_.resize(eSockEnd);
- for (int i = eSockStart; i < eSockEnd; ++i) {
- sockets_[i].reset(new ShmSocket(shm_, ssn_id_ + i, kMqLen));
+ auto NodeInit = [&]() {
+ auto SendInitCmd = [&]() {
+ int64_t init_cmd = ssn_id_ << 4 | EncodeCmd(eCmdNodeInit);
+ auto end_time = steady_clock::now() + 3s;
+ bool r = false;
+ do {
+ r = ShmMsgQueue::TrySend(shm(), BHTopicCenterAddress(), init_cmd);
+ } while (!r && steady_clock::now() < end_time);
+ return r;
+ };
+ if (SendInitCmd()) {
+ LOG_DEBUG() << "node send init ok";
+ 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()) {
+ NodeInit();
+ }
+ if (!sockets_.empty()) {
+ LOG_DEBUG() << "node sockets ok";
+ auto onNodeCmd = [this](ShmSocket &socket, int64_t &val) {
+ LOG_DEBUG() << "node recv cmd: " << DecodeCmd(val);
+ switch (DecodeCmd(val)) {
+ case eCmdNodeInitReply: {
+ MsgI msg(val >> 4);
+ DEFER1(msg.Release());
+ MsgProcInit body;
+ auto head = InitMsgHead(GetType(body), info_.proc_id(), ssn_id_);
+ head.add_route()->set_mq_id(ssn_id_);
+ if (msg.Fill(head, body)) {
+ socket.Send(BHTopicCenterAddress(), msg);
+ }
+ } break;
+ default:
+ break;
+ }
+ return true;
+ };
+
// recv msgs to avoid memory leak.
- auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
- SockNode().Start(default_ignore_msg);
+ auto onMsg = [this](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
+ LOG_DEBUG() << "node recv type: " << head.type();
+ if (head.type() == kMsgTypeProcInitReply) {
+ LOG_DEBUG() << "got proc init reply";
+ MsgProcInitReply reply;
+ if (imsg.ParseBody(reply)) {
+ SetProcIndex(reply.proc_index());
+ }
+ }
+ return true;
+ };
+ SockNode().Start(1, onMsg, onNodeCmd);
+ LOG_DEBUG() << "sockets ok.";
return true;
}
return false;
@@ -78,7 +136,7 @@
void TopicNode::Start(ServerAsyncCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
if (!Init()) {
- SetLastError(eError, "BHome Node Not Inited.");
+ SetLastError(eError, kErrMsgNotInit);
return;
}
if (nworker < 1) {
@@ -86,7 +144,7 @@
} else if (nworker > 16) {
nworker = 16;
}
- SockNode().Start();
+ // SockNode().Start();
ServerStart(server_cb, nworker);
SubscribeStartWorker(sub_cb, nworker);
ClientStartWorker(client_cb, nworker);
@@ -100,12 +158,15 @@
bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!Init()) {
- SetLastError(eError, "BHome Node Not Inited.");
- return false;
+ {
+ std::lock_guard<std::mutex> lk(mutex_);
+ info_ = proc;
}
- info_ = proc;
+ if (!Init()) {
+ SetLastError(eError, kErrMsgNotInit);
+ return false;
+ }
auto &sock = SockNode();
MsgRegister body;
@@ -151,7 +212,7 @@
bool TopicNode::Unregister(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -190,7 +251,7 @@
bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -223,7 +284,7 @@
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();
@@ -242,7 +303,7 @@
bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -309,7 +370,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;
}
@@ -333,7 +394,7 @@
bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -371,7 +432,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;
}
@@ -412,7 +473,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;
}
@@ -463,7 +524,7 @@
bool TopicNode::ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -487,7 +548,7 @@
bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -518,7 +579,7 @@
bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
if (!IsOnline()) {
- SetLastError(eNotRegistered, "Not Registered.");
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
@@ -567,7 +628,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