From af86015d724e5edf001aa024fe7d8581c45cffd9 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 15 四月 2021 10:44:12 +0800
Subject: [PATCH] fix sendq lock, use different mutexes for in,out.
---
utest/utest.cpp | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index a178fab..817cbaf 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -23,6 +23,24 @@
BOOST_AUTO_TEST_CASE(Temp)
{
+ const std::string shm_name("ShmTemp");
+ ShmRemover auto_remove(shm_name); //remove twice? in case of killed?
+ SharedMemory shm(shm_name, 1024 * 1024 * 10);
+
+ typedef std::chrono::steady_clock clock;
+ int n = 1000 * 1000;
+ std::vector<clock::time_point> tps(n);
+ {
+ printf("thread switch %d times, ", n);
+ boost::timer::auto_cpu_timer timer;
+ for (auto &tp : tps) {
+ tp = clock::now();
+ std::this_thread::yield();
+ }
+ }
+ printf("time: %ld ns\n", (tps.back() - tps.front()).count());
+ return;
+ // sub topic partial match.
Topic topics[] = {
"",
".",
@@ -103,7 +121,7 @@
std::condition_variable cv;
std::atomic<uint64_t> n(0);
- auto OnTopicData = [&](const std::string &proc_id, const std::string &topic, const std::string &data) {
+ auto OnTopicData = [&](const std::string &proc_id, const MsgPublish &pub) {
++total_count;
auto cur = Now();
@@ -128,10 +146,14 @@
for (unsigned i = 0; i < nmsg; ++i) {
std::string data = topic + std::to_string(i) + std::string(1000, '-');
-
- bool r = provider.Publish(topic, data.data(), data.size(), timeout);
+ MsgPublish pub;
+ pub.set_topic(topic);
+ pub.set_data(data);
+ bool r = provider.Publish(pub, timeout);
if (!r) {
- printf("pub ret: %s\n", r ? "ok" : "fail");
+ static std::atomic<int> an(0);
+ int n = ++an;
+ printf("pub %d ret: %s\n", n, r ? "ok" : "fail");
}
}
};
@@ -142,6 +164,7 @@
topics.push_back("t" + std::to_string(i));
}
Topics part;
+ boost::timer::auto_cpu_timer pubsub_timer;
for (size_t i = 0; i < topics.size(); ++i) {
part.push_back(topics[i]);
threads.Launch(Sub, i, topics);
@@ -194,8 +217,8 @@
std::atomic<int> count(0);
std::string reply;
- auto onRecv = [&](const std::string &rep) {
- reply = rep;
+ auto onRecv = [&](const std::string &proc_id, const MsgRequestTopicReply &msg) {
+ reply = msg.data();
if (++count >= nreq) {
printf("count: %d\n", count.load());
}
@@ -203,7 +226,10 @@
client.ClientStartWorker(onRecv, 2);
boost::timer::auto_cpu_timer timer;
for (int i = 0; i < nreq; ++i) {
- if (!client.ClientAsyncRequest(topic, "data " + std::to_string(i), 1000)) {
+ MsgRequestTopic req;
+ req.set_topic(topic);
+ req.set_data("data " + std::to_string(i));
+ if (!client.ClientAsyncRequest(req)) {
printf("client request failed\n");
++count;
}
@@ -216,7 +242,7 @@
do {
std::this_thread::yield();
} while (count.load() < nreq);
- client.StopAll();
+ client.Stop();
printf("request %s %d done ", topic.c_str(), count.load());
};
@@ -224,9 +250,9 @@
auto Server = [&](const std::string &name, const std::vector<std::string> &topics) {
DemoNode server(name, shm);
- auto onData = [&](const std::string &topic, const std::string &data, std::string &reply) {
+ auto onData = [&](const std::string &proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply) {
++server_msg_count;
- reply = topic + ':' + data;
+ reply.set_data(request.topic() + ':' + request.data());
return true;
};
server.ServerStart(onData);
@@ -258,6 +284,37 @@
servers.WaitAll();
}
+BOOST_AUTO_TEST_CASE(HeartbeatTest)
+{
+ const std::string shm_name("ShmHeartbeat");
+ ShmRemover auto_remove(shm_name);
+ SharedMemory shm(shm_name, 1024 * 1024 * 50);
+
+ BHCenter center(shm);
+ center.Start();
+
+ {
+
+ DemoNode node("demo_node", shm);
+ auto Check = [&]() {
+ bool r = node.Heartbeat(100);
+ printf("hearbeat ret : %s\n", r ? "ok" : "failed");
+ };
+ Check();
+ for (int i = 0; i < 3; ++i) {
+ std::this_thread::sleep_for(1s);
+ Check();
+ }
+ printf("sleep 4\n");
+ std::this_thread::sleep_for(4s);
+ for (int i = 0; i < 2; ++i) {
+ std::this_thread::sleep_for(1s);
+ Check();
+ }
+ }
+ printf("sleep 8\n");
+ std::this_thread::sleep_for(8s);
+}
inline int MyMin(int a, int b)
{
printf("MyMin\n");
--
Gitblit v1.8.0