From 34cd75f77d0ca94dbdba4e6cc9451fe4d33e78b3 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 19:14:13 +0800
Subject: [PATCH] add api BHQueryProcs.
---
utest/api_test.cpp | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index c6165e8..33adf91 100644
--- a/utest/api_test.cpp
+++ b/utest/api_test.cpp
@@ -118,6 +118,8 @@
printf("maxsec: %ld\n", CountSeconds(max_time));
+ // BHCleanup();
+ // return;
bool reg = false;
for (int i = 0; i < 3 && !reg; ++i) {
ProcInfo proc;
@@ -127,7 +129,23 @@
void *reply = 0;
int reply_len = 0;
reg = BHRegister(proc_buf.data(), proc_buf.size(), &reply, &reply_len, 2000);
- printf("register %s\n", reg ? "ok" : "failed");
+ if (reg) {
+ printf("register ok\n");
+ // bool r = BHUnregister(proc_buf.data(), proc_buf.size(), &reply, &reply_len, 2000);
+ // printf("unregister %s\n", r ? "ok" : "failed");
+ // reg = BHRegister(proc_buf.data(), proc_buf.size(), &reply, &reply_len, 2000);
+ // if (!reg) {
+ // int ec = 0;
+ // std::string msg;
+ // GetLastError(ec, msg);
+ // printf("reg error: %s\n", msg.c_str());
+ // }
+ } else {
+ int ec = 0;
+ std::string msg;
+ GetLastError(ec, msg);
+ printf("register failed, %d, %s\n", ec, msg.c_str());
+ }
BHFree(reply, reply_len);
Sleep(1s);
@@ -147,9 +165,36 @@
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));
// printf("register topic : %s\n", r ? "ok" : "failed");
- Sleep(1s);
+ // Sleep(1s);
+ }
+ {
+ // 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())) {
+ 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", t.c_str());
+ }
+ }
+ } else {
+ printf("query proc error\n");
+ }
+ // printf("register topic : %s\n", r ? "ok" : "failed");
+ // Sleep(1s);
}
{ // Subscribe
@@ -192,7 +237,7 @@
auto SyncRequest = [&](int idx) { // SyncRequest
MsgRequestTopic req;
- req.set_topic(topic_ + std::to_string(idx));
+ 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);
@@ -237,6 +282,7 @@
DEFER1(BHFree(msg_id, len););
// Sleep(10ms, false);
std::string dest(BHAddress().SerializeAsString());
+
bool r = BHAsyncRequest(dest.data(), dest.size(), s.data(), s.size(), 0, 0);
if (r) {
++Status().nrequest_;
@@ -276,27 +322,37 @@
std::atomic<bool> run(true);
- BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
ThreadManager threads;
+
+#if 0
+ 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 uint64_t nreq = 1000 * 100;
+ const int64_t nreq = 1000 * 100;
+
+ for (int i = 0; i < 100; ++i) {
+ SyncRequest(i);
+ }
+
for (int i = 0; i < ncli; ++i) {
threads.Launch(asyncRequest, nreq);
}
- // for (int i = 0; i < 100; ++i) {
- // SyncRequest(0);
- // }
int same = 0;
- int64_t last = 0;
- while (last < nreq * ncli && same < 2) {
+ uint64_t last = 0;
+ while (last < nreq * ncli && same < 3) {
Sleep(1s, false);
auto cur = Status().nreply_.load();
if (last == cur) {
++same;
+ printf("same %d\n", same);
} else {
last = cur;
same = 0;
@@ -306,6 +362,7 @@
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