From 1c92e4cbc85f9501660444cb76ebb06770da9376 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 15:36:11 +0800
Subject: [PATCH] reserve #xxx proc id for internal use.
---
src/topic_node.cpp | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 8bbb929..124d329 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>
@@ -51,7 +52,6 @@
TopicNode::~TopicNode()
{
- LOG_DEBUG() << "~TopicNode()";
Stop();
}
@@ -66,13 +66,13 @@
}
if (ssn_id_ == 0) {
- ssn_id_ = ShmMsgQueue::NewId();
+ ssn_id_ = NewSession();
}
LOG_DEBUG() << "Node Init, id " << ssn_id_;
auto NodeInit = [&]() {
int64_t init_request = ssn_id_ << 4 | EncodeCmd(eCmdNodeInit);
int64_t reply = 0;
- if (BHNodeInit(init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
+ 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";
@@ -94,7 +94,7 @@
auto head = InitMsgHead(GetType(body), info_.proc_id(), ssn_id_);
AddRoute(head, socket);
if (imsg.Fill(head, body)) {
- socket.Send(BHTopicCenterAddress(), imsg);
+ socket.Send(CenterAddr(), imsg);
}
} break;
case kMsgTypeProcInitReply: {
@@ -140,13 +140,17 @@
}
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::UniRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ auto ValidUserProcId = [](const std::string &id) { return !id.empty() && id[0] != '#'; };
+ if (!internal && !ValidUserProcId(proc.proc_id())) {
+ SetLastError(eInvalidInput, "invalid proc id :'" + proc.proc_id() + "'");
+ return false;
+ }
+
{
std::lock_guard<std::mutex> lk(mutex_);
info_ = proc;
@@ -189,12 +193,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);
}
@@ -230,12 +234,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);
}
}
@@ -255,12 +259,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()));
}
@@ -284,10 +288,10 @@
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));
}
@@ -303,10 +307,10 @@
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() == kMsgTypeQueryProcReply &&
reply.ParseBody(reply_body));
}
@@ -326,12 +330,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;
@@ -399,10 +403,11 @@
}
BHMsgHead head;
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) {
- robust::QuickSleep();
+ sleeper.Sleep();
} else {
return false;
}
@@ -526,7 +531,7 @@
AddRoute(head, sock);
head.set_topic(request.topic());
- MsgI reply_msg;
+ MsgI reply_msg(shm());
DEFER1(reply_msg.Release(););
BHMsgHead reply_head;
@@ -597,13 +602,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());
@@ -630,12 +635,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());
@@ -677,10 +682,11 @@
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) {
- robust::QuickSleep();
+ sleeper.Sleep();
} else {
return false;
}
--
Gitblit v1.8.0