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 | 193 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 137 insertions(+), 56 deletions(-)
diff --git a/utest/api_test.cpp b/utest/api_test.cpp
index ae3f10a..33adf91 100644
--- a/utest/api_test.cpp
+++ b/utest/api_test.cpp
@@ -16,8 +16,10 @@
* =====================================================================================
*/
#include "bh_api.h"
+#include "robust.h"
#include "util.h"
#include <atomic>
+#include <boost/lockfree/queue.hpp>
using namespace bhome_msg;
@@ -49,7 +51,6 @@
static MsgStatus st;
return st;
}
-} // namespace
void SubRecvProc(const void *proc_id,
const int proc_id_len,
@@ -59,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,
@@ -96,47 +97,10 @@
// printf("client Recv reply : %s\n", reply.data().c_str());
}
-BOOST_AUTO_TEST_CASE(MutexTest)
-{
- const std::string shm_name("ShmMutex");
- // ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024 * 1024 * 10);
-
- const std::string mtx_name("test_mutex");
- const std::string int_name("test_int");
- auto mtx = shm.find_or_construct<Mutex>(mtx_name.c_str())();
- auto pi = shm.find_or_construct<int>(int_name.c_str())(100);
- if (pi) {
- auto old = *pi;
- printf("int : %d, add1: %d\n", old, ++*pi);
- }
-
- auto TryLock = [&]() {
- if (mtx->try_lock()) {
- printf("try_lock ok\n");
- return true;
- } else {
- printf("try_lock failed\n");
- return false;
- }
- };
- auto Unlock = [&]() {
- mtx->unlock();
- printf("unlocked\n");
- };
-
- if (mtx) {
- printf("mtx exists\n");
- if (TryLock()) {
- if (TryLock()) {
- Unlock();
- }
- // Unlock();
- }
- } else {
- printf("mtx not exists\n");
- }
-}
+} // namespace
+#include <chrono>
+using namespace std::chrono;
+// using namespace std::chrono_literals;
BOOST_AUTO_TEST_CASE(ApiTest)
{
@@ -154,8 +118,10 @@
printf("maxsec: %ld\n", CountSeconds(max_time));
+ // BHCleanup();
+ // return;
bool reg = false;
- for (int i = 0; i < 10 && !reg; ++i) {
+ for (int i = 0; i < 3 && !reg; ++i) {
ProcInfo proc;
proc.set_proc_id("demo_client");
proc.set_public_info("public info of demo_client. etc...");
@@ -163,15 +129,34 @@
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);
}
+ if (!reg) {
+ return;
+ }
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));
@@ -180,12 +165,39 @@
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
MsgTopicList topics;
for (int i = 0; i < 10; ++i) {
topics.add_topic_list(topic_ + std::to_string(i * 2));
@@ -198,13 +210,61 @@
printf("subscribe topic : %s\n", r ? "ok" : "failed");
}
- BHStartWorker(&ServerProc, &SubRecvProc, &ClientProc);
+ auto ServerLoop = [&](std::atomic<bool> *run) {
+ while (*run) {
+ void *proc_id = 0;
+ int proc_id_len = 0;
+ DEFER1(BHFree(proc_id, proc_id_len););
+ void *input = 0;
+ int input_len = 0;
+ DEFER1(BHFree(input, input_len));
+ void *src = 0;
+ if (BHReadRequest(&proc_id, &proc_id_len, &input, &input_len, &src, 10) && src) {
+ MsgRequestTopic request;
+ if (request.ParseFromArray(input, input_len)) {
+ MsgRequestTopicReply reply;
+ reply.set_data(" reply: " + request.data());
+ std::string s(reply.SerializeAsString());
+ // printf("%s", reply.data().c_str());
+ BHSendReply(src, s.data(), s.size());
+ ++Status().nserved_;
+ }
+ src = 0;
+ }
+ }
+ };
+
+ 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, 100);
+ if (!r) {
+ int ec = 0;
+ std::string msg;
+ GetLastError(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());
+ }
+ };
{
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 * 1024, 'a'));
+ pub.set_data("pub_data_" + std::string(1024 * 1, 'a'));
std::string s(pub.SerializeAsString());
BHPublish(s.data(), s.size(), 0);
// Sleep(1s);
@@ -219,9 +279,11 @@
std::string s(req.SerializeAsString());
void *msg_id = 0;
int len = 0;
- // Sleep(10ms, false);
- bool r = BHAsyncRequest(s.data(), s.size(), 0, 0);
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_;
} else {
@@ -257,24 +319,40 @@
printf("heartbeat: %s\n", r ? "ok" : "failed");
}
};
+
std::atomic<bool> run(true);
+
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);
}
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;
@@ -284,5 +362,8 @@
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");
}
\ No newline at end of file
--
Gitblit v1.8.0