From 2197cf91e7a3bd5941327ba630a42946b88f069e Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 09 四月 2021 14:15:41 +0800
Subject: [PATCH] join pub/sub to node; refactor.
---
utest/speed_test.cpp | 78 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/utest/speed_test.cpp b/utest/speed_test.cpp
index 34f80d8..b1f11ac 100644
--- a/utest/speed_test.cpp
+++ b/utest/speed_test.cpp
@@ -28,14 +28,21 @@
MQId id = boost::uuids::random_generator()();
const int timeout = 100;
const uint32_t data_size = 4000;
+ const std::string proc_id = "demo_proc";
auto Writer = [&](int writer_id, uint64_t n) {
SharedMemory shm(shm_name, mem_size);
ShmMsgQueue mq(shm, 64);
std::string str(data_size, 'a');
MsgI msg;
+ MsgRequestTopic body;
+ body.set_topic("topic");
+ body.set_data(str);
+ auto head(InitMsgHead(GetType(body), proc_id));
+ msg.MakeRC(shm, head, body);
+ assert(msg.IsCounted());
DEFER1(msg.Release(shm););
- msg.MakeRC(shm, MakeRequest(mq.Id(), "topic", str.data(), str.size()));
+
for (uint64_t i = 0; i < n; ++i) {
// mq.Send(id, str.data(), str.size(), timeout);
mq.Send(id, msg, timeout);
@@ -45,8 +52,10 @@
SharedMemory shm(shm_name, mem_size);
ShmMsgQueue mq(id, shm, 1000);
while (*run) {
- BHMsg msg;
+ MsgI msg;
+ BHMsgHead head;
if (mq.Recv(msg, timeout)) {
+ DEFER1(msg.Release(shm));
// ok
} else if (isfork) {
exit(0); // for forked quit after 1s.
@@ -113,17 +122,28 @@
const size_t msg_length = 1000;
std::string msg_content(msg_length, 'a');
msg_content[20] = '\0';
+ const std::string client_proc_id = "client_proc";
+ const std::string server_proc_id = "server_proc";
SharedMemory shm(shm_name, 1024 * 1024 * 50);
auto Avail = [&]() { return shm.get_free_memory(); };
auto init_avail = Avail();
- ShmMsgQueue srv(shm, qlen);
- ShmMsgQueue cli(shm, qlen);
+ ShmSocket srv(shm, qlen);
+ ShmSocket cli(shm, qlen);
MsgI request_rc;
- request_rc.MakeRC(shm, MakeRequest(cli.Id(), "topic", msg_content.data(), msg_content.size()));
+ MsgRequestTopic req_body;
+ req_body.set_topic("topic");
+ req_body.set_data(msg_content);
+ auto req_head(InitMsgHead(GetType(req_body), client_proc_id));
+ request_rc.MakeRC(shm, req_head, req_body);
+
+ MsgRequestTopic reply_body;
+ reply_body.set_topic("topic");
+ reply_body.set_data(msg_content);
+ auto reply_head(InitMsgHead(GetType(reply_body), server_proc_id));
MsgI reply_rc;
- reply_rc.MakeRC(shm, MakeReply("fakemsgid", msg_content.data(), msg_content.size()));
+ reply_rc.MakeRC(shm, reply_head, reply_body);
std::atomic<uint64_t> count(0);
@@ -133,18 +153,24 @@
auto Client = [&](int cli_id, int nmsg) {
for (int i = 0; i < nmsg; ++i) {
auto Req = [&]() {
- return cli.Send(srv.Id(), MakeRequest(cli.Id(), "topic", msg_content.data(), msg_content.size()), 100);
+ MsgRequestTopic req_body;
+ req_body.set_topic("topic");
+ req_body.set_data(msg_content);
+ auto req_head(InitMsgHead(GetType(req_body), client_proc_id));
+ return cli.Send(&srv.id(), req_head, req_body, 100);
};
- auto ReqRC = [&]() { return cli.Send(srv.Id(), request_rc, 1000); };
+ auto ReqRC = [&]() { return cli.Send(&srv.id(), request_rc, 1000); };
if (!ReqRC()) {
printf("********** client send error.\n");
continue;
}
- BHMsg msg;
- if (!cli.Recv(msg, 1000)) {
+ MsgI msg;
+ BHMsgHead head;
+ if (!cli.SyncRecv(msg, head, 1000)) {
printf("********** client recv error.\n");
} else {
+ DEFER1(msg.Release(shm));
++count;
auto cur = Now();
if (last_time.exchange(cur) < cur) {
@@ -158,18 +184,28 @@
std::atomic<bool> stop(false);
auto Server = [&]() {
- BHMsg req;
- while (!stop) {
- if (srv.Recv(req, 100) && req.type() == kMsgTypeRequestTopic) {
- auto &mqid = req.route()[0].mq_id();
- MQId src_id;
- memcpy(&src_id, mqid.data(), sizeof(src_id));
- auto Reply = [&]() {
- return srv.Send(src_id, MakeReply(req.msg_id(), msg_content.data(), msg_content.size()), 100);
- };
- auto ReplyRC = [&]() { return srv.Send(src_id, reply_rc, 100); };
+ MsgI req;
+ BHMsgHead req_head;
- if (ReplyRC()) {
+ while (!stop) {
+ if (srv.SyncRecv(req, req_head, 100)) {
+ DEFER1(req.Release(shm));
+
+ if (req.ParseHead(req_head) && req_head.type() == kMsgTypeRequestTopic) {
+ auto &mqid = req_head.route()[0].mq_id();
+ MQId src_id;
+ memcpy(&src_id, mqid.data(), sizeof(src_id));
+ auto Reply = [&]() {
+ MsgRequestTopic reply_body;
+ reply_body.set_topic("topic");
+ reply_body.set_data(msg_content);
+ auto reply_head(InitMsgHead(GetType(reply_body), server_proc_id, req_head.msg_id()));
+ return srv.Send(&src_id, reply_head, reply_body, 100);
+ };
+ auto ReplyRC = [&]() { return srv.Send(&src_id, reply_rc, 100); };
+
+ if (ReplyRC()) {
+ }
}
}
}
--
Gitblit v1.8.0