From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置
---
utest/api_test.cpp | 270 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 175 insertions(+), 95 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index 3d842bf..13a552d 100644
--- a/utest/api_test.cpp
+++ b/utest/api_test.cpp
@@ -16,6 +16,7 @@
* =====================================================================================
*/
#include "bh_api.h"
+#include "json.h"
#include "robust.h"
#include "util.h"
#include <atomic>
@@ -111,25 +112,8 @@
using namespace std::chrono;
// using namespace std::chrono_literals;
-BOOST_AUTO_TEST_CASE(ApiTest)
+bool Register(const std::string &proc_id)
{
- auto max_time = std::chrono::steady_clock::time_point::max();
- auto dur = max_time.time_since_epoch();
- auto nsec = std::chrono::duration_cast<std::chrono::seconds>(dur).count();
- auto nmin = nsec / 60;
- auto nhour = nmin / 60;
- auto nday = nhour / 24;
- auto years = nday / 365;
- printf("seconds: %ld, hours: %ld , days:%ld, years: %ld\n",
- nsec, nhour, nday, years);
- std::chrono::steady_clock::duration a(123456);
- printf("nowsec: %ld\n", NowSec());
-
- printf("maxsec: %ld\n", CountSeconds(max_time));
-
- // BHCleanup();
- // return;
- const std::string proc_id = "demo_client";
bool reg = false;
for (int i = 0; i < 3 && !reg; ++i) {
ProcInfo proc;
@@ -160,7 +144,96 @@
BHFree(reply, reply_len);
// Sleep(1s);
}
- if (!reg) {
+ return reg;
+}
+
+bool SyncRequest(const std::string &topic, const std::string &data)
+{ // SyncRequest
+ MsgRequestTopic req;
+ req.set_topic(topic);
+ req.set_data(data);
+ std::string s(req.SerializeAsString());
+ // Sleep(10ms, false);
+ std::string dest(BHAddress().SerializeAsString());
+ void *proc_id = 0;
+ int proc_id_len = 0;
+ DEFER1(BHFree(proc_id, proc_id_len););
+ void *reply = 0;
+ int reply_len = 0;
+ DEFER1(BHFree(reply, reply_len));
+ bool r = BHRequest(dest.data(), dest.size(), s.data(), s.size(), &proc_id, &proc_id_len, &reply, &reply_len, 100);
+ if (!r) {
+ int ec = 0;
+ std::string msg;
+ GetApiError(ec, msg);
+ printf("request error: %d, %s\n", ec, msg.c_str());
+ } else {
+ MsgRequestTopicReply ret;
+ ret.ParseFromArray(reply, reply_len);
+ printf("request result: %s\n", ret.data().c_str());
+ }
+ return r;
+}
+
+BOOST_AUTO_TEST_CASE(RestartTest)
+{
+ const std::string proc_id = "demo_node";
+ for (int i = 0; i < 5; ++i) {
+ printf("loop: %d --------------------------\n", i);
+ if (!Register(proc_id)) { continue; }
+
+ const std::string topic_ = "topic_";
+
+ { // Server Register Topics
+ MsgTopicList topics;
+ for (int i = 0; i < 10; ++i) {
+ topics.add_topic_list(topic_ + std::to_string(i));
+ }
+ std::string s = topics.SerializeAsString();
+ void *reply = 0;
+ int reply_len = 0;
+ bool r = BHRegisterTopics(s.data(), s.size(), &reply, &reply_len, 1000);
+ DEFER1(BHFree(reply, reply_len));
+ }
+
+ BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
+
+ for (int i = 0; i < 60; ++i) {
+ bool r = SyncRequest(topic_ + std::to_string(0), "request_data_" + std::to_string(i));
+ if (!r) {
+ void *msg = 0;
+ int msg_len = 0;
+ DEFER1(BHFree(msg, msg_len));
+ int ec = BHGetLastError(&msg, &msg_len);
+ if (ec == eNotRegistered) {
+ printf("need re-register\n");
+ break;
+ }
+ }
+ Sleep(1s);
+ }
+ }
+ BHCleanup();
+}
+
+BOOST_AUTO_TEST_CASE(ApiTest)
+{
+ auto max_time = std::chrono::steady_clock::time_point::max();
+ auto dur = max_time.time_since_epoch();
+ auto nsec = std::chrono::duration_cast<std::chrono::seconds>(dur).count();
+ auto nmin = nsec / 60;
+ auto nhour = nmin / 60;
+ auto nday = nhour / 24;
+ auto years = nday / 365;
+ printf("seconds: %ld, hours: %ld , days:%ld, years: %ld\n",
+ nsec, nhour, nday, years);
+ std::chrono::steady_clock::duration a(123456);
+ printf("nowsec: %ld\n", NowSec());
+
+ printf("maxsec: %ld\n", CountSeconds(max_time));
+
+ const std::string proc_id = "demo_client";
+ if (!Register(proc_id)) {
return;
}
@@ -177,21 +250,6 @@
bool r = BHRegisterTopics(s.data(), s.size(), &reply, &reply_len, 1000);
DEFER1(BHFree(reply, reply_len));
}
- { // Server Register Topics
- MsgTopicList topics;
- topics.add_topic_list("@should_fail");
- std::string s = topics.SerializeAsString();
- void *reply = 0;
- int reply_len = 0;
- bool r = BHRegisterTopics(s.data(), s.size(), &reply, &reply_len, 1000);
- DEFER1(BHFree(reply, reply_len));
- if (!r) {
- int ec = 0;
- std::string msg;
- GetApiError(ec, msg);
- printf("register rpc failed, %d, %s\n", ec, msg.c_str());
- }
- }
auto PrintProcs = [](MsgQueryProcReply const &result) {
printf("query proc result: %d\n", result.proc_list().size());
for (int i = 0; i < result.proc_list().size(); ++i) {
@@ -199,14 +257,21 @@
printf("proc [%d] %s, %s, %s\n\ttopics\n", i,
(info.online() ? "online" : "offline"),
info.proc().proc_id().c_str(), info.proc().name().c_str());
- for (auto &t : info.topics().topic_list()) {
- printf("\t\t %s\n", t.c_str());
- }
+ auto PrintTopics = [](std::string const &name, auto &topic_list) {
+ printf("%s:[", name.c_str());
+ for (auto &t : topic_list) {
+ printf("%s,", t.c_str());
+ }
+ printf("]\n");
+ };
+ PrintTopics("service", info.service().topic_list());
+ PrintTopics("local_sub", info.local_sub().topic_list());
+ PrintTopics("net_sub", info.net_sub().topic_list());
printf("\n");
}
printf("\n");
};
- {
+ if (1) {
// query procs
std::string dest(BHAddress().SerializeAsString());
MsgQueryProc query;
@@ -224,14 +289,22 @@
// printf("register topic : %s\n", r ? "ok" : "failed");
// Sleep(1s);
}
- {
+ for (int i = 0; i < 3; ++i) {
// query procs with normal topic request
MsgRequestTopic req;
req.set_topic("#center_query_procs");
// req.set_data("{\"proc_id\":\"#center.node\"}");
std::string s(req.SerializeAsString());
// Sleep(10ms, false);
- std::string dest(BHAddress().SerializeAsString());
+ BHAddress host;
+ printf("query with ip set\n");
+ host.set_ip("127.0.0.1");
+ host.set_port(kBHCenterPort);
+ // center topic node address.
+ // host.set_mq_id(201);
+ // host.set_abs_addr(10072);
+
+ std::string dest(host.SerializeAsString());
void *proc_id = 0;
int proc_id_len = 0;
DEFER1(BHFree(proc_id, proc_id_len););
@@ -247,7 +320,7 @@
} else {
MsgRequestTopicReply ret;
ret.ParseFromArray(reply, reply_len);
- printf("topic query proc : %s\n", ret.data().c_str());
+ printf("\ntopic query proc : %s\n", ret.data().c_str());
// MsgQueryProcReply result;
// if (result.ParseFromArray(ret.data().data(), ret.data().size()) && IsSuccess(result.errmsg().errcode())) {
// PrintProcs(result);
@@ -258,17 +331,27 @@
}
{ // Subscribe
- MsgTopicList topics;
- topics.add_topic_list("#center.node");
- for (int i = 0; i < 10; ++i) {
- topics.add_topic_list(topic_ + std::to_string(i * 2));
- }
- std::string s = topics.SerializeAsString();
- void *reply = 0;
- int reply_len = 0;
- bool r = BHSubscribeTopics(s.data(), s.size(), &reply, &reply_len, 1000);
- BHFree(reply, reply_len);
- printf("subscribe topic : %s\n", r ? "ok" : "failed");
+ auto Subscribe = [&](std::string topic, bool net) {
+ MsgTopicList topics;
+ topics.add_topic_list(topic);
+ for (int i = 0; i < 10; ++i) {
+ topics.add_topic_list(topic_ + std::to_string(i * 2));
+ }
+ std::string s = topics.SerializeAsString();
+ void *reply = 0;
+ int reply_len = 0;
+ bool r = false;
+ if (net) {
+ r = BHSubscribeNetTopics(s.data(), s.size(), &reply, &reply_len, 1000);
+ } else {
+ r = BHSubscribeTopics(s.data(), s.size(), &reply, &reply_len, 1000);
+ }
+ BHFree(reply, reply_len);
+ printf("subscribe topic %s: %s\n", topic.c_str(), (r ? "ok" : "failed"));
+ };
+ Subscribe("#center.node", false);
+ Subscribe("local0", false);
+ Subscribe("net0", true);
}
auto ServerLoop = [&](std::atomic<bool> *run) {
@@ -296,39 +379,47 @@
}
};
- auto SyncRequest = [&](int idx) { // SyncRequest
- MsgRequestTopic req;
- req.set_topic(topic_ + std::to_string(0));
- req.set_data("request_data_" + std::to_string(idx));
- std::string s(req.SerializeAsString());
- // Sleep(10ms, false);
- std::string dest(BHAddress().SerializeAsString());
- void *proc_id = 0;
- int proc_id_len = 0;
- DEFER1(BHFree(proc_id, proc_id_len););
- void *reply = 0;
- int reply_len = 0;
- DEFER1(BHFree(reply, reply_len));
- bool r = BHRequest(dest.data(), dest.size(), s.data(), s.size(), &proc_id, &proc_id_len, &reply, &reply_len, 1000);
- if (!r) {
- int ec = 0;
- std::string msg;
- GetApiError(ec, msg);
- printf("request error: %s\n", msg.c_str());
- } else {
- MsgRequestTopicReply ret;
- ret.ParseFromArray(reply, reply_len);
- printf("request result: %s\n", ret.data().c_str());
- }
+ std::atomic<bool> run(true);
+ ThreadManager threads;
+#if 1
+ BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
+#else
+ BHStartWorker(FServerCallback(), &SubRecvProc, &ClientProc);
+ threads.Launch(ServerLoop, &run);
+#endif
+
+ auto Publish = [&](const std::string &topic, const std::string &data) {
+ MsgPublish pub;
+ pub.set_topic(topic);
+ pub.set_data(data);
+ std::string s(pub.SerializeAsString());
+ BHPublish(s.data(), s.size(), 0);
};
+
{
+ // publish
+ Publish(topic_ + std::to_string(0), "pub_data_" + std::string(104 * 1, 'a'));
for (int i = 0; i < 1; ++i) {
- MsgPublish pub;
- pub.set_topic(topic_ + std::to_string(i));
- pub.set_data("pub_data_" + std::string(1024 * 1, 'a'));
- std::string s(pub.SerializeAsString());
- BHPublish(s.data(), s.size(), 0);
- // Sleep(1s);
+
+ ssjson::Json net = ssjson::Json::Array();
+ ssjson::Json host;
+ host.put("serverId", "test_host");
+ host.put("ip", "127.0.0.1");
+ ssjson::Json topics = ssjson::Json::Array();
+ topics.push_back("aaaaa");
+ topics.push_back("bbbbb");
+ host.put("pubTopics", topics);
+ topics.push_back("net0");
+ topics.push_back("net1");
+ host.put("netSubTopics", topics);
+ net.push_back(host);
+
+ Publish("pub-allRegisterInfo-to-center", net.dump());
+ Sleep(1s);
+ Publish("local0", "local-abcd0");
+ Publish("net0", "net-abcd0");
+ Publish("local0", "local-abcd1");
+ Sleep(1s);
}
}
@@ -381,25 +472,14 @@
}
};
- std::atomic<bool> run(true);
-
- ThreadManager threads;
-
-#if 1
- BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
-#else
- BHStartWorker(FServerCallback(), &SubRecvProc, &ClientProc);
- threads.Launch(ServerLoop, &run);
-#endif
-
boost::timer::auto_cpu_timer timer;
threads.Launch(hb, &run);
threads.Launch(showStatus, &run);
int ncli = 10;
- const int64_t nreq = 1000 * 100;
+ const int64_t nreq = 1000; //* 100;
for (int i = 0; i < 10; ++i) {
- SyncRequest(i);
+ SyncRequest(topic_ + std::to_string(0), "request_data_" + std::to_string(i));
}
for (int i = 0; i < ncli; ++i) {
--
Gitblit v1.8.0