From 153375e3b152768cbffce715d049499945834c29 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 13 四月 2021 15:11:14 +0800
Subject: [PATCH] add api code, use proto msg as data.
---
src/topic_node.cpp | 86 +++++++++++++++---------------------------
1 files changed, 31 insertions(+), 55 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 788c536..8f039de 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -39,7 +39,7 @@
TopicNode::TopicNode(SharedMemory &shm) :
shm_(shm), sock_node_(shm), sock_request_(shm), sock_reply_(shm), sock_sub_(shm)
{
- Start();
+ SockNode().Start();
}
TopicNode::~TopicNode()
@@ -47,14 +47,15 @@
Stop();
}
-void TopicNode::Start()
+void TopicNode::Start(ServerCB const &server_cb, SubDataCB const &sub_cb)
{
- SockNode().Start();
- SockClient().Start();
- SockServer().Start();
+ ServerStart(server_cb, 1);
+ SubscribeStartWorker(sub_cb, 1);
+ // SockClient().Start();
}
void TopicNode::Stop()
{
+ SockSub().Stop();
SockServer().Stop();
SockClient().Stop();
SockNode().Stop();
@@ -132,10 +133,8 @@
return r;
}
-bool TopicNode::ServerStart(const OnRequest &rcb, int nworker)
+bool TopicNode::ServerStart(const ServerCB &rcb, int nworker)
{
- //TODO check registered
-
auto failed_q = std::make_shared<ServerFailedQ>();
auto onIdle = [failed_q](ShmSocket &socket) { failed_q->TrySend(socket); };
@@ -144,10 +143,8 @@
if (head.type() == kMsgTypeRequestTopic && head.route_size() > 0) {
MsgRequestTopic req;
if (imsg.ParseBody(req)) {
- std::string out;
- if (rcb(req.topic(), req.data(), out)) {
- MsgRequestTopicReply reply_body;
- reply_body.set_data(std::move(out));
+ MsgRequestTopicReply reply_body;
+ if (rcb(head.proc_id(), req, reply_body)) {
BHMsgHead reply_head(InitMsgHead(GetType(reply_body), proc_id(), head.msg_id()));
for (int i = 0; i < head.route_size() - 1; ++i) {
@@ -173,17 +170,15 @@
return rcb && sock.Start(onRecv, onIdle, nworker);
}
-bool TopicNode::ServerRecvRequest(void *&src_info, std::string &topic, std::string &data, const int timeout_ms)
+bool TopicNode::ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms)
{
auto &sock = SockServer();
MsgI imsg;
BHMsgHead head;
if (sock.SyncRecv(imsg, head, timeout_ms) && head.type() == kMsgTypeRequestTopic) {
- MsgRequestTopic request;
if (imsg.ParseBody(request)) {
- request.mutable_topic()->swap(topic);
- request.mutable_data()->swap(data);
+ head.mutable_proc_id()->swap(proc_id);
SrcInfo *p = new SrcInfo;
p->route.assign(head.route().begin(), head.route().end());
p->msg_id = head.msg_id();
@@ -194,7 +189,7 @@
return false;
}
-bool TopicNode::ServerSendReply(void *src_info, const std::string &data, const int timeout_ms)
+bool TopicNode::ServerSendReply(void *src_info, const MsgRequestTopicReply &body, const int timeout_ms)
{
auto &sock = SockServer();
@@ -203,14 +198,10 @@
if (!p || p->route.empty()) {
return false;
}
- MsgRequestTopicReply body;
- body.set_data(data);
BHMsgHead head(InitMsgHead(GetType(body), proc_id(), p->msg_id));
-
for (unsigned i = 0; i < p->route.size() - 1; ++i) {
head.add_route()->Swap(&p->route[i]);
}
-
return sock.Send(p->route.back().mq_id().data(), head, body, timeout_ms);
}
@@ -223,7 +214,7 @@
if (head.type() == kMsgTypeRequestTopicReply) {
MsgRequestTopicReply reply;
if (imsg.ParseBody(reply)) {
- cb(reply.data());
+ cb(head.proc_id(), reply);
}
}
};
@@ -231,14 +222,11 @@
return SockRequest().Start(onData, nworker);
}
-bool TopicNode::ClientAsyncRequest(const Topic &topic, const void *data, const size_t size, const int timeout_ms, const RequestResultCB &cb)
+bool TopicNode::ClientAsyncRequest(const MsgRequestTopic &req, const int timeout_ms, const RequestResultCB &cb)
{
auto Call = [&](const void *remote) {
auto &sock = SockRequest();
- MsgRequestTopic req;
- req.set_topic(topic);
- req.set_data(data, size);
BHMsgHead head(InitMsgHead(GetType(req), proc_id()));
AddRoute(head, sock.id());
@@ -247,7 +235,7 @@
if (head.type() == kMsgTypeRequestTopicReply) {
MsgRequestTopicReply reply;
if (imsg.ParseBody(reply)) {
- cb(reply.data());
+ cb(head.proc_id(), reply);
}
}
};
@@ -259,9 +247,10 @@
try {
BHAddress addr;
- if (ClientQueryRPCTopic(topic, addr, timeout_ms)) {
+ if (ClientQueryRPCTopic(req.topic(), addr, timeout_ms)) {
return Call(addr.mq_id().data());
} else {
+ SetLastError(eNotFound, "remote not found.");
return false;
}
} catch (...) {
@@ -269,37 +258,30 @@
}
}
-bool TopicNode::ClientSyncRequest(const Topic &topic, const void *data, const size_t size, std::string &out, const int timeout_ms)
+bool TopicNode::ClientSyncRequest(const MsgRequestTopic &request, std::string &out_proc_id, MsgRequestTopicReply &out_reply, const int timeout_ms)
{
try {
auto &sock = SockRequest();
BHAddress addr;
- if (ClientQueryRPCTopic(topic, addr, timeout_ms)) {
-
- MsgRequestTopic req;
- req.set_topic(topic);
- req.set_data(data, size);
- BHMsgHead head(InitMsgHead(GetType(req), proc_id()));
+ if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
+ BHMsgHead head(InitMsgHead(GetType(request), proc_id()));
AddRoute(head, sock.id());
- MsgI reply;
- DEFER1(reply.Release(shm_););
+ MsgI reply_msg;
+ DEFER1(reply_msg.Release(shm_););
BHMsgHead reply_head;
- if (sock.SendAndRecv(addr.mq_id().data(), head, req, reply, reply_head, timeout_ms) && reply_head.type() == kMsgTypeRequestTopicReply) {
- MsgRequestTopicReply dr;
- if (reply.ParseBody(dr)) {
- dr.mutable_data()->swap(out);
+ if (sock.SendAndRecv(addr.mq_id().data(), head, request, reply_msg, reply_head, timeout_ms) && reply_head.type() == kMsgTypeRequestTopicReply) {
+ if (reply_msg.ParseBody(out_reply)) {
+ reply_head.mutable_proc_id()->swap(out_proc_id);
return true;
} else {
printf("error parse reply.\n");
}
- } else {
- printf("error recv data. line: %d\n", __LINE__);
}
} else {
- printf("error recv data. line: %d\n", __LINE__);
+ SetLastError(eNotFound, "remote not found.");
}
} catch (...) {
printf("error recv data. line: %d\n", __LINE__);
@@ -344,14 +326,10 @@
// publish
-bool TopicNode::Publish(const Topic &topic, const void *data, const size_t size, const int timeout_ms)
+bool TopicNode::Publish(const MsgPublish &pub, const int timeout_ms)
{
try {
auto &sock = SockPub();
-
- MsgPublish pub;
- pub.set_topic(topic);
- pub.set_data(data, size);
BHMsgHead head(InitMsgHead(GetType(pub), proc_id()));
AddRoute(head, sock.id());
@@ -386,7 +364,7 @@
}
}
-bool TopicNode::SubscribeStartWorker(const TopicDataCB &tdcb, int nworker)
+bool TopicNode::SubscribeStartWorker(const SubDataCB &tdcb, int nworker)
{
auto &sock = SockSub();
@@ -394,7 +372,7 @@
if (head.type() == kMsgTypePublish) {
MsgPublish pub;
if (imsg.ParseBody(pub)) {
- tdcb(head.proc_id(), pub.topic(), pub.data());
+ tdcb(head.proc_id(), pub);
}
} else {
// ignored, or dropped
@@ -404,18 +382,16 @@
return tdcb && sock.Start(AsyncRecvProc, nworker);
}
-bool TopicNode::RecvSub(std::string &proc_id, Topic &topic, std::string &data, const int timeout_ms)
+bool TopicNode::RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms)
{
auto &sock = SockSub();
MsgI msg;
DEFER1(msg.Release(shm()););
BHMsgHead head;
+ //TODO error msg.
if (sock.SyncRecv(msg, head, timeout_ms) && head.type() == kMsgTypePublish) {
- MsgPublish pub;
if (msg.ParseBody(pub)) {
head.mutable_proc_id()->swap(proc_id);
- pub.mutable_topic()->swap(topic);
- pub.mutable_data()->swap(data);
return true;
}
}
--
Gitblit v1.8.0