From 11f6c600e55ca5677f93624efe44d2605cdd908d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 20:18:38 +0800
Subject: [PATCH] reserve #,@ prefix for internal proc id and topic.
---
utest/api_test.cpp | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index dc3efb6..3d842bf 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 {
@@ -138,13 +147,13 @@
// 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());
}
@@ -167,8 +176,21 @@
int reply_len = 0;
bool r = BHRegisterTopics(s.data(), s.size(), &reply, &reply_len, 1000);
DEFER1(BHFree(reply, reply_len));
- // printf("register topic : %s\n", r ? "ok" : "failed");
- // Sleep(1s);
+ }
+ { // 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());
@@ -205,7 +227,8 @@
{
// query procs with normal topic request
MsgRequestTopic req;
- req.set_topic("@center_query_procs");
+ 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());
@@ -219,7 +242,7 @@
if (!r) {
int ec = 0;
std::string msg;
- GetLastError(ec, msg);
+ GetApiError(ec, msg);
printf("topic query proc error: %s\n", msg.c_str());
} else {
MsgRequestTopicReply ret;
@@ -290,7 +313,7 @@
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;
@@ -331,7 +354,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());
}
}
@@ -373,7 +396,7 @@
threads.Launch(hb, &run);
threads.Launch(showStatus, &run);
int ncli = 10;
- const int64_t nreq = 10; //00 * 100;
+ const int64_t nreq = 1000 * 100;
for (int i = 0; i < 10; ++i) {
SyncRequest(i);
@@ -397,10 +420,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