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/utest.cpp | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index 572d8e5..7cb9587 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,16 +1,33 @@
#include "center.h"
#include "defs.h"
+#include "log.h"
#include "util.h"
#include <atomic>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
#include <condition_variable>
#include <stdio.h>
#include <string>
#include <thread>
#include <vector>
+namespace
+{
+bool InitLog()
+{
+ ns_log::AddLog("/tmp/bhshmq_test.log", true, true);
+ ns_log::ResetLogLevel(ns_log::LogLevel::debug);
+ return true;
+}
+static bool g_test_init_log = InitLog();
+} // namespace
+
+using namespace bhome_shm;
using namespace bhome_msg;
+
+SharedMemory &TestShm()
+{
+ static SharedMemory shm("utest_0", 1024 * 1024 * 512);
+ return shm;
+}
template <class A, class B>
struct IsSameType {
@@ -84,13 +101,12 @@
BOOST_AUTO_TEST_CASE(PubSubTest)
{
- const std::string shm_name("ShmPubSub");
- ShmRemover auto_remove(shm_name); //remove twice? in case of killed?
- SharedMemory shm(shm_name, 1024 * 1024 * 50);
- DEFER1(shm.Remove());
+ SharedMemory &shm = TestShm();
+ GlobalInit(shm);
+
auto Avail = [&]() { return shm.get_free_memory(); };
auto init_avail = Avail();
- int *flag = shm.find_or_construct<int>("flag")(123);
+ int *flag = shm.FindOrCreate<int>("flag", 123);
printf("flag = %d\n", *flag);
++*flag;
const std::string sub_proc_id = "subscriber";
@@ -102,7 +118,7 @@
Sleep(100ms);
std::atomic<uint64_t> total_count(0);
- std::atomic<ptime> last_time(Now() - seconds(1));
+ std::atomic<int64_t> last_time(NowSec() - 1);
std::atomic<uint64_t> last_count(0);
const uint64_t nmsg = 100 * 2;
@@ -125,7 +141,7 @@
auto OnTopicData = [&](const std::string &proc_id, const MsgPublish &pub) {
++total_count;
- auto cur = Now();
+ auto cur = NowSec();
if (last_time.exchange(cur) < cur) {
std::cout << "time: " << cur;
printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
@@ -177,7 +193,7 @@
threads.Launch(Pub, "some_else");
threads.WaitAll();
- std::cout << "end : " << Now();
+
printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
total_count.load(), total_count - last_count.exchange(total_count), init_avail - Avail());
}
@@ -196,13 +212,12 @@
BOOST_AUTO_TEST_CASE(ReqRepTest)
{
- const std::string shm_name("ShmReqRep");
- ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024 * 1024 * 512);
+ SharedMemory &shm = TestShm();
+ GlobalInit(shm);
auto Avail = [&]() { return shm.get_free_memory(); };
auto init_avail = Avail();
- int *flag = shm.find_or_construct<int>("flag")(123);
+ int *flag = shm.FindOrCreate<int>("flag", 123);
printf("flag = %d\n", *flag);
++*flag;
@@ -227,11 +242,13 @@
MsgRequestTopic req;
req.set_topic(topic);
req.set_data("data " + std::string(100, 'a'));
+
client.ClientStartWorker(onRecv, 2);
+
boost::timer::auto_cpu_timer timer;
for (int i = 0; i < nreq; ++i) {
std::string msg_id;
- if (!client.ClientAsyncRequest(req, msg_id)) {
+ if (!client.ClientAsyncRequest(BHAddress(), req, msg_id)) {
printf("client request failed\n");
++count;
}
@@ -244,7 +261,7 @@
// ++count;
}
do {
- std::this_thread::yield();
+ std::this_thread::sleep_for(100ms);
} while (count.load() < nreq);
client.Stop();
printf("request %s %d done ", topic.c_str(), count.load());
@@ -254,12 +271,18 @@
auto Server = [&](const std::string &name, const std::vector<std::string> &topics) {
DemoNode server(name, shm);
- auto onData = [&](const std::string &proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply) {
+ auto onDataSync = [&](const std::string &proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply) {
++server_msg_count;
reply.set_data(request.topic() + ':' + request.data());
return true;
};
- server.ServerStart(onData);
+ auto onDataAsync = [&](void *src, std::string &proc_id, MsgRequestTopic &request) {
+ ++server_msg_count;
+ MsgRequestTopicReply reply;
+ reply.set_data(request.topic() + ':' + request.data());
+ server.ServerSendReply(src, reply);
+ };
+ server.ServerStart(onDataAsync);
MsgTopicList rpc;
for (auto &topic : topics) {
@@ -272,7 +295,7 @@
}
while (run) {
- std::this_thread::yield();
+ std::this_thread::sleep_for(100ms);
}
};
ThreadManager clients, servers;
--
Gitblit v1.8.0