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 | 95 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index d8d6a42..35228b4 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -42,7 +42,6 @@
TopicNode::TopicNode(SharedMemory &shm) :
shm_(shm), state_(eStateUnregistered)
{
- Init();
}
TopicNode::~TopicNode()
@@ -57,34 +56,79 @@
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)) {
-
- 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));
+ 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);
}
- 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;
+ } 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 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;
}
@@ -100,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);
@@ -114,12 +158,15 @@
bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ {
+ std::lock_guard<std::mutex> lk(mutex_);
+ info_ = proc;
+ }
+
if (!Init()) {
SetLastError(eError, kErrMsgNotInit);
return false;
}
-
- info_ = proc;
auto &sock = SockNode();
MsgRegister body;
--
Gitblit v1.8.0