From 72851db66655912cb9c92300a80985fb9797d168 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 01 六月 2021 16:25:23 +0800
Subject: [PATCH] remove AtomicQueue, not used.
---
utest/api_test.cpp | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 19 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index 533c399..bddcbf7 100644
--- a/utest/api_test.cpp
+++ b/utest/api_test.cpp
@@ -27,6 +27,15 @@
{
typedef std::atomic<uint64_t> Number;
+void GetApiError(int &ec, std::string &msg)
+{
+ void *pmsg = 0;
+ int msg_len = 0;
+ ec = BHGetLastError(&pmsg, &msg_len);
+ msg.assign((char *) pmsg, msg_len);
+ BHFree(pmsg, msg_len);
+}
+
void Assign(Number &a, const Number &b) { a.store(b.load()); }
struct MsgStatus {
@@ -60,7 +69,7 @@
std::string proc((const char *) proc_id, proc_id_len);
MsgPublish pub;
pub.ParseFromArray(data, data_len);
- printf("Sub data, %s : %s\n", pub.topic().c_str(), pub.data().c_str());
+ printf("****************************************** Sub data, %s : %s\n", pub.topic().c_str(), pub.data().c_str());
}
void ServerProc(const void *proc_id,
@@ -120,10 +129,11 @@
// BHCleanup();
// return;
+ const std::string proc_id = "demo_client";
bool reg = false;
for (int i = 0; i < 3 && !reg; ++i) {
ProcInfo proc;
- proc.set_proc_id("demo_client");
+ proc.set_proc_id(proc_id);
proc.set_public_info("public info of demo_client. etc...");
std::string proc_buf(proc.SerializeAsString());
void *reply = 0;
@@ -137,24 +147,24 @@
// if (!reg) {
// int ec = 0;
// std::string msg;
- // GetLastError(ec, msg);
+ // GetApiError(ec, msg);
// printf("reg error: %s\n", msg.c_str());
// }
} else {
int ec = 0;
std::string msg;
- GetLastError(ec, msg);
+ GetApiError(ec, msg);
printf("register failed, %d, %s\n", ec, msg.c_str());
}
BHFree(reply, reply_len);
- Sleep(1s);
+ // Sleep(1s);
}
if (!reg) {
return;
}
- const std::string topic_ = "topic_";
+ const std::string topic_ = proc_id + "_topic_";
{ // Server Register Topics
MsgTopicList topics;
@@ -165,13 +175,98 @@
void *reply = 0;
int reply_len = 0;
bool r = BHRegisterTopics(s.data(), s.size(), &reply, &reply_len, 1000);
- BHFree(reply, reply_len);
+ 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) {
+ auto &info = result.proc_list(i);
+ 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());
+ }
+ printf("\n");
+ }
+ printf("\n");
+ };
+ if (0) {
+ // query procs
+ std::string dest(BHAddress().SerializeAsString());
+ MsgQueryProc query;
+ std::string s = query.SerializeAsString();
+ void *reply = 0;
+ int reply_len = 0;
+ bool r = BHQueryProcs(dest.data(), dest.size(), s.data(), s.size(), &reply, &reply_len, 1000);
+ DEFER1(BHFree(reply, reply_len));
+ MsgQueryProcReply result;
+ if (result.ParseFromArray(reply, reply_len) && IsSuccess(result.errmsg().errcode())) {
+ PrintProcs(result);
+ } else {
+ printf("query proc error\n");
+ }
// 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);
+ BHAddress host;
+ printf("query with ip set\n");
+ host.set_ip("127.0.0.1");
+ host.set_port(kBHCenterPort);
+ host.set_mq_id(1000011);
+ host.set_abs_addr(10296);
+
+ std::string dest(host.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("topic query proc error: %s\n", msg.c_str());
+ } else {
+ MsgRequestTopicReply ret;
+ ret.ParseFromArray(reply, reply_len);
+ 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);
+ // } else {
+ // printf("topic query proc error\n");
+ // }
+ }
}
{ // 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));
}
@@ -221,11 +316,11 @@
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);
+ 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;
- GetLastError(ec, msg);
+ GetApiError(ec, msg);
printf("request error: %s\n", msg.c_str());
} else {
MsgRequestTopicReply ret;
@@ -237,7 +332,7 @@
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'));
+ pub.set_data("pub_data_" + std::string(104 * 1, 'a'));
std::string s(pub.SerializeAsString());
BHPublish(s.data(), s.size(), 0);
// Sleep(1s);
@@ -266,7 +361,7 @@
if (last.exchange(now) < now) {
int ec = 0;
std::string msg;
- GetLastError(ec, msg);
+ GetApiError(ec, msg);
printf("request topic error --------- : %s\n", msg.c_str());
}
}
@@ -297,7 +392,7 @@
ThreadManager threads;
-#if 0
+#if 1
BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
#else
BHStartWorker(FServerCallback(), &SubRecvProc, &ClientProc);
@@ -310,15 +405,13 @@
int ncli = 10;
const int64_t nreq = 1000 * 100;
-#if 1
+ for (int i = 0; i < 10; ++i) {
+ SyncRequest(i);
+ }
+
for (int i = 0; i < ncli; ++i) {
threads.Launch(asyncRequest, nreq);
}
-#else
- for (int i = 0; i < 100; ++i) {
- SyncRequest(i);
- }
-#endif
int same = 0;
uint64_t last = 0;
@@ -334,10 +427,11 @@
}
}
+ Sleep(1s);
+
run = false;
threads.WaitAll();
auto &st = Status();
- Sleep(1s);
printf("nreq: %8ld, nsrv: %8ld, nreply: %8ld\n", st.nrequest_.load(), st.nserved_.load(), st.nreply_.load());
BHCleanup();
printf("after cleanup\n");
--
Gitblit v1.8.0