From d1f89c1eb52a08b97d5be5dd991c5991b6f0bf93 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 21 四月 2021 16:41:30 +0800
Subject: [PATCH] 修改包名，作为go依赖库
---
src/topic_node.cpp | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 2cc5483..70247dd 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -32,21 +32,26 @@
std::string msg_id;
};
+const int kMqLen = 700;
+
} // namespace
TopicNode::TopicNode(SharedMemory &shm) :
- shm_(shm), sock_node_(shm), sock_client_(shm), sock_server_(shm), sock_sub_(shm), registered_(false), registered_ever_(false)
+ shm_(shm), sock_node_(shm), sock_client_(shm, kMqLen), sock_server_(shm, kMqLen), sock_sub_(shm, kMqLen), state_(eStateUnregistered)
{
// recv msgs to avoid memory leak.
auto default_ignore_msg = [](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) { return true; };
SockNode().Start(default_ignore_msg);
+ SockClient().Start(default_ignore_msg);
+ SockServer().Start(default_ignore_msg);
+ SockSub().Start(default_ignore_msg);
}
TopicNode::~TopicNode()
{
Stop();
SockNode().Stop();
- if (!registered_ever_) {
+ if (state() == eStateUnregistered) {
SockNode().Remove();
SockClient().Remove();
SockServer().Remove();
@@ -54,7 +59,7 @@
}
}
-void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
+void TopicNode::Start(ServerAsyncCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker)
{
if (nworker < 1) {
nworker = 1;
@@ -95,9 +100,10 @@
msg.ParseBody(rbody) &&
IsSuccess(rbody.errmsg().errcode());
if (ok) {
- registered_ever_.store(true);
+ state(eStateOnline);
+ } else {
+ state_cas(eStateOnline, eStateOffline);
}
- registered_.store(ok);
};
if (timeout_ms == 0) {
@@ -114,13 +120,13 @@
if (r) {
CheckResult(reply, reply_head, reply_body);
}
- return IsRegistered();
+ return IsOnline();
}
}
bool TopicNode::Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -153,7 +159,7 @@
bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -178,7 +184,7 @@
}
}
-bool TopicNode::ServerStart(const ServerCB &rcb, int nworker)
+bool TopicNode::ServerStart(const ServerSyncCB &rcb, int nworker)
{
auto onRecv = [this, rcb](ShmSocket &sock, MsgI &imsg, BHMsgHead &head) {
if (head.type() != kMsgTypeRequestTopic || head.route_size() == 0) { return; }
@@ -201,9 +207,26 @@
return rcb && sock.Start(onRecv, nworker);
}
+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; }
+
+ SrcInfo *p = new SrcInfo;
+ p->route.assign(head.route().begin(), head.route().end());
+ p->msg_id = head.msg_id();
+ acb(p, *head.mutable_proc_id(), req);
+ };
+
+ auto &sock = SockServer();
+ return acb && sock.Start(onRecv, nworker);
+}
+
bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -227,7 +250,7 @@
bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -265,7 +288,7 @@
bool TopicNode::ClientAsyncRequest(const MsgRequestTopic &req, std::string &out_msg_id, const RequestResultCB &cb)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -296,13 +319,15 @@
};
try {
- auto &sock = SockClient();
BHAddress addr;
-
- if (topic_query_cache_.Find(req.topic(), addr)) {
+#if 1
+ return (ClientQueryRPCTopic(req.topic(), addr, 3000)) && SendTo(addr, req, cb);
+#else
+ if (topic_query_cache_.Pick(req.topic(), addr)) {
return SendTo(addr, req, cb);
}
+ auto &sock = SockClient();
MsgQueryTopic query;
query.set_topic(req.topic());
BHMsgHead head(InitMsgHead(GetType(query), proc_id()));
@@ -313,12 +338,13 @@
if (head.type() == kMsgTypeQueryTopicReply && imsg.ParseBody(rep)) {
auto &addr = rep.address();
if (!addr.mq_id().empty()) {
- topic_query_cache_.Update(req.topic(), addr);
+ topic_query_cache_.Store(req.topic(), addr);
SendTo(addr, req, cb);
}
}
};
- return sock.Send(&BHTopicCenterAddress(), head, query, onQueryResult);
+ return sock.Send(&BHTopicCenterAddress(), head, query, std::move(onQueryResult));
+#endif
} catch (...) {
SetLastError(eError, "internal error.");
@@ -328,7 +354,7 @@
bool TopicNode::ClientSyncRequest(const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -361,9 +387,9 @@
return false;
}
-bool TopicNode::ClientQueryRPCTopic(const Topic &topic, bhome::msg::BHAddress &addr, const int timeout_ms)
+bool TopicNode::ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -391,7 +417,7 @@
if (addr.mq_id().empty()) {
return false;
} else {
- topic_query_cache_.Update(topic, addr);
+ topic_query_cache_.Store(topic, addr);
return true;
}
}
@@ -405,7 +431,7 @@
bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -436,7 +462,7 @@
bool TopicNode::Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
@@ -485,7 +511,7 @@
bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
{
- if (!IsRegistered()) {
+ if (!IsOnline()) {
SetLastError(eNotRegistered, "Not Registered.");
return false;
}
--
Gitblit v1.8.0