From 68c7bef33e74f23aa0136ccd6f7faa654d671ebc Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 09:23:01 +0800
Subject: [PATCH] center publish notify; fix topic partial match.
---
utest/api_test.cpp | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index 33adf91..dc3efb6 100644
--- a/utest/api_test.cpp
+++ b/utest/api_test.cpp
@@ -60,7 +60,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 +120,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;
@@ -148,13 +149,13 @@
}
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;
@@ -169,6 +170,20 @@
// printf("register topic : %s\n", r ? "ok" : "failed");
// Sleep(1s);
}
+ 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");
+ };
{
// query procs
std::string dest(BHAddress().SerializeAsString());
@@ -180,25 +195,48 @@
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());
- }
- }
+ PrintProcs(result);
} else {
printf("query proc error\n");
}
// printf("register topic : %s\n", r ? "ok" : "failed");
// Sleep(1s);
}
+ {
+ // query procs with normal topic request
+ MsgRequestTopic req;
+ req.set_topic("@center_query_procs");
+ 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;
+ GetLastError(ec, msg);
+ printf("topic query proc error: %s\n", msg.c_str());
+ } else {
+ MsgRequestTopicReply ret;
+ ret.ParseFromArray(reply, reply_len);
+ printf("topic 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));
}
@@ -248,7 +286,7 @@
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;
@@ -324,7 +362,7 @@
ThreadManager threads;
-#if 0
+#if 1
BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
#else
BHStartWorker(FServerCallback(), &SubRecvProc, &ClientProc);
@@ -335,9 +373,9 @@
threads.Launch(hb, &run);
threads.Launch(showStatus, &run);
int ncli = 10;
- const int64_t nreq = 1000 * 100;
+ const int64_t nreq = 10; //00 * 100;
- for (int i = 0; i < 100; ++i) {
+ for (int i = 0; i < 10; ++i) {
SyncRequest(i);
}
--
Gitblit v1.8.0