From 11f6c600e55ca5677f93624efe44d2605cdd908d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 20:18:38 +0800
Subject: [PATCH] reserve #,@ prefix for internal proc id and topic.
---
src/topic_node.cpp | 272 +++++++++++++++++++++++++++++++----------------------
1 files changed, 158 insertions(+), 114 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 51a0ab7..3c38121 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -17,6 +17,7 @@
*/
#include "topic_node.h"
#include "bh_util.h"
+#include "sleeper.h"
#include <chrono>
#include <list>
@@ -28,6 +29,11 @@
namespace
{
+bool ValidUserSymbol(const std::string &s)
+{
+ return !s.empty() && s[0] != '#' && s[0] != '@';
+}
+
inline void AddRoute(BHMsgHead &head, const ShmSocket &sock)
{
auto route = head.add_route();
@@ -51,7 +57,6 @@
TopicNode::~TopicNode()
{
- LOG_DEBUG() << "~TopicNode()";
Stop();
}
@@ -66,73 +71,57 @@
}
if (ssn_id_ == 0) {
- ssn_id_ = ShmMsgQueue::NewId();
+ ssn_id_ = NewSession();
}
LOG_DEBUG() << "Node Init, id " << ssn_id_;
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 {
- //TODO recv offset, avoid query.
- 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);
+ int64_t init_request = ssn_id_ << 4 | EncodeCmd(eCmdNodeInit);
+ int64_t reply = 0;
+ if (BHNodeInit(shm(), init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
+ int64_t abs_addr = reply >> 4;
+ sockets_.emplace_back(new ShmSocket(abs_addr, shm_, ssn_id_));
+ LOG_DEBUG() << "node init ok";
+ } else {
+ LOG_ERROR() << "Node Init Error";
}
};
if (sockets_.empty()) {
NodeInit();
}
if (!sockets_.empty()) {
- 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());
+ auto onMsg = [this](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
+ LOG_DEBUG() << "node recv type: " << head.type();
+ switch (head.type()) {
+ case kMsgTypeProcInit: {
+ // reuse msg to send proc init.
MsgProcInit body;
+ body.set_extra_mq_num(eSockEnd - eSockStart - 1);
auto head = InitMsgHead(GetType(body), info_.proc_id(), ssn_id_);
AddRoute(head, socket);
- if (msg.Fill(head, body)) {
- socket.Send(BHTopicCenterAddress(), msg);
+ if (imsg.Fill(head, body)) {
+ socket.Send(CenterAddr(), imsg);
}
} 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) {
+ case kMsgTypeProcInitReply: {
LOG_DEBUG() << "got proc init reply";
MsgProcInitReply reply;
- if (imsg.ParseBody(reply)) {
+ if (imsg.ParseBody(reply) && IsSuccess(reply.errmsg().errcode())) {
+ for (auto &addr : reply.extra_mqs()) {
+ LOG_DEBUG() << "add socket " << addr.abs_addr() << ", id:" << addr.mq_id();
+ sockets_.emplace_back(new ShmSocket(addr.abs_addr(), shm(), addr.mq_id()));
+ }
SetProcIndex(reply.proc_index());
this->state_ = eStateUnregistered;
+
+ ServerStart(ServerAsyncCB(), 1);
+ SubscribeStartWorker(SubDataCB(), 1);
}
+ } break;
+ default: break;
}
return true;
};
- SockNode().Start(1, onMsg, onNodeCmd);
+ SockNode().Start(1, onMsg);
return true;
}
return false;
@@ -156,13 +145,16 @@
}
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)
+bool TopicNode::DoRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!internal && !ValidUserSymbol(proc.proc_id())) {
+ SetLastError(eInvalidInput, "invalid proc id :'" + proc.proc_id() + "'");
+ return false;
+ }
+
{
std::lock_guard<std::mutex> lk(mutex_);
info_ = proc;
@@ -174,10 +166,10 @@
}
auto end_time = steady_clock::now() + milliseconds(timeout_ms);
- while (state_ != eStateUnregistered && steady_clock::now() < end_time) {
+ while (!Valid() && steady_clock::now() < end_time) {
std::this_thread::yield();
}
- if (state_ != eStateUnregistered) {
+ if (!Valid()) {
SetLastError(eError, kErrMsgNotInit);
return false;
}
@@ -205,12 +197,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(BHTopicCenterAddress(), head, body, onResult);
+ return sock.Send(CenterAddr(), head, body, onResult);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
if (r) {
CheckResult(reply, reply_head, reply_body);
}
@@ -246,12 +238,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(BHTopicCenterAddress(), head, body, onResult);
+ return sock.Send(CenterAddr(), head, body, onResult);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
return r && CheckResult(reply, reply_head, reply_body);
}
}
@@ -271,12 +263,12 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicCenterAddress(), head, body);
+ return sock.Send(CenterAddr(), head, body);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply && reply.ParseBody(reply_body);
return (r && IsSuccess(reply_body.errmsg().errcode()));
}
@@ -300,16 +292,44 @@
BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
AddRoute(head, sock);
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release());
BHMsgHead reply_head;
- return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
+ return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeQueryTopicReply &&
reply.ParseBody(reply_body));
}
-bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+bool TopicNode::QueryProcs(BHAddress &dest, MsgQueryProc &query, MsgQueryProcReply &reply_body, const int timeout_ms)
{
+ if (!IsOnline()) {
+ SetLastError(eNotRegistered, kErrMsgNotRegistered);
+ return false;
+ }
+ auto &sock = SockNode();
+
+ BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
+ AddRoute(head, sock);
+
+ MsgI reply(shm());
+ DEFER1(reply.Release());
+ BHMsgHead reply_head;
+ return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
+ reply_head.type() == kMsgTypeQueryProcReply &&
+ reply.ParseBody(reply_body));
+}
+
+bool TopicNode::DoServerRegisterRPC(const bool internal, MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+{
+ if (!internal) {
+ for (auto &&topic : topics.topic_list()) {
+ if (!ValidUserSymbol(topic)) {
+ SetLastError(eInvalidInput, "invalid user topic :'" + topic + "'");
+ return false;
+ }
+ }
+ }
+
if (!IsOnline()) {
SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
@@ -323,12 +343,12 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicCenterAddress(), head, body);
+ return sock.Send(CenterAddr(), head, body);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply;
r = r && reply.ParseBody(reply_body);
return r;
@@ -360,26 +380,32 @@
bool TopicNode::ServerStart(const ServerAsyncCB &acb, int nworker)
{
- auto onRecv = [this, acb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
- if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
- MsgRequestTopic req;
- if (!imsg.ParseBody(req)) { return; }
+ if (acb) {
+ auto onRecv = [this, acb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
+ if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
+ MsgRequestTopic req;
+ if (!imsg.ParseBody(req)) { return; }
- try {
- SrcInfo *p = new SrcInfo;
- if (!p) {
- throw std::runtime_error("no memory.");
+ try {
+ SrcInfo *p = new SrcInfo;
+ if (!p) {
+ throw std::runtime_error("no memory.");
+ }
+ p->route.assign(head.route().begin(), head.route().end());
+ p->msg_id = head.msg_id();
+ acb(p, *head.mutable_proc_id(), req);
+ } catch (std::exception &e) {
+ LOG_ERROR() << "error server handle msg:" << e.what();
}
- p->route.assign(head.route().begin(), head.route().end());
- p->msg_id = head.msg_id();
- acb(p, *head.mutable_proc_id(), req);
- } catch (std::exception &e) {
- LOG_ERROR() << "error server handle msg:" << e.what();
- }
- };
+ };
- auto &sock = SockServer();
- return acb && sock.Start(onRecv, nworker);
+ return SockServer().Start(onRecv, nworker);
+ } else {
+ auto onRequest = [this](ShmSocket &socket, MsgI &msg, BHMsgHead &head) {
+ server_buffer_->Write(std::move(head), msg.body());
+ };
+ return SockServer().Start(onRequest, nworker);
+ }
}
bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
@@ -388,13 +414,20 @@
SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
}
-
- auto &sock = SockServer();
-
- MsgI imsg;
BHMsgHead head;
- if (sock.SyncRecv(imsg, head, timeout_ms) && head.type() == kMsgTypeRequestTopic) {
- if (imsg.ParseBody(request)) {
+ std::string body;
+ FibUSleeper sleeper(1000 * 10);
+ auto end_time = steady_clock::now() + milliseconds(timeout_ms);
+ while (!server_buffer_->Read(head, body)) {
+ if (steady_clock::now() < end_time) {
+ sleeper.Sleep();
+ } else {
+ return false;
+ }
+ }
+
+ if (head.type() == kMsgTypeRequestTopic) {
+ if (request.ParseFromString(body)) {
head.mutable_proc_id()->swap(proc_id);
try {
SrcInfo *p = new SrcInfo;
@@ -511,7 +544,7 @@
AddRoute(head, sock);
head.set_topic(request.topic());
- MsgI reply_msg;
+ MsgI reply_msg(shm());
DEFER1(reply_msg.Release(););
BHMsgHead reply_head;
@@ -582,13 +615,13 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicBusAddress(), head, pub);
+ return sock.Send(BusAddr(), head, pub);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
MsgCommonReply reply_body;
- return sock.SendAndRecv(BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BusAddr(), head, pub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
@@ -615,12 +648,12 @@
BHMsgHead head(InitMsgHead(GetType(sub), proc_id(), ssn()));
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicBusAddress(), head, sub);
+ return sock.Send(BusAddr(), head, sub);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- return sock.SendAndRecv(BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BusAddr(), head, sub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
@@ -633,20 +666,24 @@
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);
+ if (tdcb) {
+ 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
}
- } else {
- // ignored, or dropped
- }
- };
-
- return tdcb && sock.Start(AsyncRecvProc, nworker);
+ };
+ return SockSub().Start(AsyncRecvProc, nworker);
+ } else {
+ auto onSub = [this](ShmSocket &socket, MsgI &msg, BHMsgHead &head) {
+ sub_buffer_->Write(std::move(head), msg.body());
+ };
+ return SockSub().Start(onSub, nworker);
+ }
}
bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
@@ -656,13 +693,20 @@
return false;
}
- auto &sock = SockSub();
- MsgI msg;
- DEFER1(msg.Release(););
BHMsgHead head;
+ std::string body;
+ FibUSleeper sleeper(1000 * 10);
+ auto end_time = steady_clock::now() + milliseconds(timeout_ms);
+ while (!sub_buffer_->Read(head, body)) {
+ if (steady_clock::now() < end_time) {
+ sleeper.Sleep();
+ } else {
+ return false;
+ }
+ }
//TODO error msg.
- if (sock.SyncRecv(msg, head, timeout_ms) && head.type() == kMsgTypePublish) {
- if (msg.ParseBody(pub)) {
+ if (head.type() == kMsgTypePublish) {
+ if (pub.ParseFromString(body)) {
head.mutable_proc_id()->swap(proc_id);
return true;
}
--
Gitblit v1.8.0