From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.
---
utest/utest.cpp | 136 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 44 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index c925e22..12d4396 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,8 +1,5 @@
#include "center.h"
#include "defs.h"
-#include "pubsub.h"
-#include "socket.h"
-#include "topic_node.h"
#include "util.h"
#include <atomic>
#include <boost/uuid/uuid_generators.hpp>
@@ -12,6 +9,7 @@
#include <string>
#include <thread>
#include <vector>
+
using namespace bhome_msg;
template <class A, class B>
@@ -25,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[] = {
"",
".",
@@ -83,7 +99,7 @@
BHCenter center(shm);
center.Start();
- std::this_thread::sleep_for(100ms);
+ Sleep(100ms);
std::atomic<uint64_t> total_count(0);
std::atomic<ptime> last_time(Now() - seconds(1));
@@ -92,13 +108,21 @@
const uint64_t nmsg = 100 * 2;
const int timeout = 1000;
auto Sub = [&](int id, const std::vector<std::string> &topics) {
- SocketSubscribe client(shm);
- bool r = client.Subscribe(sub_proc_id, topics, timeout);
+ DemoNode client("client_" + std::to_string(id), shm);
+ MsgTopicList tlist;
+ for (auto &t : topics) {
+ tlist.add_topic_list(t);
+ }
+ MsgCommonReply reply_body;
+ bool r = client.Subscribe(tlist, reply_body, timeout);
+ if (!r) {
+ printf("client subscribe failed.\n");
+ }
std::mutex mutex;
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();
@@ -112,20 +136,25 @@
}
// printf("sub %2d recv: %s/%s\n", id, pub.topic().c_str(), pub.data().c_str());
};
- client.StartRecv(OnTopicData, 1);
+ client.SubscribeStartWorker(OnTopicData, 1);
std::unique_lock<std::mutex> lk(mutex);
cv.wait(lk);
};
auto Pub = [&](const std::string &topic) {
- SocketPublish provider(shm);
+ DemoNode provider("server_" + topic, shm);
+
for (unsigned i = 0; i < nmsg; ++i) {
std::string data = topic + std::to_string(i) + std::string(1000, '-');
-
- bool r = provider.Publish(pub_proc_id, topic, data.data(), data.size(), timeout);
+ MsgPublish pub;
+ pub.set_topic(topic);
+ pub.set_data(data);
+ bool r = provider.Publish(pub, 0);
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");
}
}
};
@@ -136,11 +165,12 @@
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);
}
- std::this_thread::sleep_for(100ms);
+ Sleep(100ms);
for (auto &topic : topics) {
threads.Launch(Pub, topic);
}
@@ -184,20 +214,12 @@
std::atomic<bool> run(true);
auto Client = [&](const std::string &topic, const int nreq) {
- TopicNode client(shm);
- MsgRegister reg;
- reg.mutable_proc()->set_proc_id(client_proc_id + topic);
- MsgCommonReply reply_body;
-
- if (!client.Register(reg, reply_body, 1000)) {
- printf("client register failed\n");
- return;
- }
+ DemoNode client(client_proc_id + topic, shm);
std::atomic<int> count(0);
std::string reply;
- auto onRecv = [&](const std::string &rep) {
- reply = rep;
+ auto onRecv = [&](const BHMsgHead &head, const MsgRequestTopicReply &msg) {
+ reply = msg.data();
if (++count >= nreq) {
printf("count: %d\n", count.load());
}
@@ -205,7 +227,11 @@
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));
+ std::string msg_id;
+ if (!client.ClientAsyncRequest(req, msg_id)) {
printf("client request failed\n");
++count;
}
@@ -218,34 +244,27 @@
do {
std::this_thread::yield();
} while (count.load() < nreq);
- client.ClientStopWorker();
+ client.Stop();
printf("request %s %d done ", topic.c_str(), count.load());
};
+
std::atomic_uint64_t server_msg_count(0);
auto Server = [&](const std::string &name, const std::vector<std::string> &topics) {
- TopicNode server(shm);
- MsgRegister reg;
- reg.mutable_proc()->set_proc_id(server_proc_id);
- reg.mutable_proc()->set_name(name);
- MsgCommonReply reply_body;
+ DemoNode server(name, shm);
- if (!server.Register(reg, reply_body, 100)) {
- printf("server register failed\n");
- return;
- }
-
- 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);
- MsgRegisterRPC rpc;
+ MsgTopicList rpc;
for (auto &topic : topics) {
- rpc.add_topics(topic);
+ rpc.add_topic_list(topic);
}
- if (!server.RegisterRPC(rpc, reply_body, 100)) {
+ MsgCommonReply reply_body;
+ if (!server.ServerRegisterRPC(rpc, reply_body, 100)) {
printf("server register topic failed\n");
return;
}
@@ -257,16 +276,45 @@
ThreadManager clients, servers;
std::vector<Topic> topics = {"topic1", "topic2"};
servers.Launch(Server, "server", topics);
- std::this_thread::sleep_for(100ms);
+ Sleep(100ms);
for (auto &t : topics) {
- clients.Launch(Client, t, 1000 * 1);
+ clients.Launch(Client, t, 1000 * 100);
}
clients.WaitAll();
- printf("clients done, server replyed: %d\n", server_msg_count.load());
+ printf("clients done, server replyed: %ld\n", server_msg_count.load());
run = false;
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) {
+ Sleep(1s);
+ Check();
+ }
+ Sleep(4s);
+ for (int i = 0; i < 2; ++i) {
+ Sleep(1s);
+ Check();
+ }
+ }
+ Sleep(8s);
+}
inline int MyMin(int a, int b)
{
printf("MyMin\n");
--
Gitblit v1.8.0