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 | 183 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 38 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index 54c6d6f..12d4396 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,9 +1,5 @@
+#include "center.h"
#include "defs.h"
-#include "pubsub.h"
-#include "pubsub_center.h"
-#include "reqrep.h"
-#include "reqrep_center.h"
-#include "socket.h"
#include "util.h"
#include <atomic>
#include <boost/uuid/uuid_generators.hpp>
@@ -13,6 +9,8 @@
#include <string>
#include <thread>
#include <vector>
+
+using namespace bhome_msg;
template <class A, class B>
struct IsSameType {
@@ -25,7 +23,25 @@
BOOST_AUTO_TEST_CASE(Temp)
{
- std::string topics[] = {
+ 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[] = {
"",
".",
"a",
@@ -77,11 +93,13 @@
int *flag = shm.find_or_construct<int>("flag")(123);
printf("flag = %d\n", *flag);
++*flag;
+ const std::string sub_proc_id = "subscriber";
+ const std::string pub_proc_id = "publisher";
- PubSubCenter bus(shm);
- bus.Start();
+ 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));
@@ -90,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(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 &topic, const std::string &data) {
+ auto OnTopicData = [&](const std::string &proc_id, const MsgPublish &pub) {
++total_count;
auto cur = Now();
@@ -110,35 +136,41 @@
}
// 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(topic, data, 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");
}
}
};
ThreadManager threads;
- typedef std::vector<std::string> Topics;
+ typedef std::vector<Topic> Topics;
Topics topics;
for (int i = 0; i < 100; ++i) {
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);
}
@@ -148,9 +180,19 @@
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());
-
- bus.Stop();
}
+
+namespace
+{
+struct C {
+ C() { printf("+C\n"); }
+ C(const C &c) { printf("+C(const C&)\n"); }
+ void F() { printf("C::F()\n"); }
+ ~C() { printf("-C\n"); }
+ char arr[100];
+};
+int F(C &c) { return printf(":::::::::::::F()\n"); }
+} // namespace
BOOST_AUTO_TEST_CASE(ReqRepTest)
{
@@ -164,50 +206,115 @@
printf("flag = %d\n", *flag);
++*flag;
- ReqRepCenter center(shm);
- center.Start(2);
+ const std::string client_proc_id = "client_proc_";
+ const std::string server_proc_id = "server_proc_";
+
+ BHCenter center(shm);
+ center.Start();
std::atomic<bool> run(true);
auto Client = [&](const std::string &topic, const int nreq) {
- SocketRequest client(shm);
+ DemoNode client(client_proc_id + topic, shm);
+
+ std::atomic<int> count(0);
std::string reply;
+ auto onRecv = [&](const BHMsgHead &head, const MsgRequestTopicReply &msg) {
+ reply = msg.data();
+ if (++count >= nreq) {
+ printf("count: %d\n", count.load());
+ }
+ };
+ client.ClientStartWorker(onRecv, 2);
boost::timer::auto_cpu_timer timer;
for (int i = 0; i < nreq; ++i) {
- if (!client.SyncRequest(topic, "data " + std::to_string(i), reply, 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;
}
+
+ // if (!client.SyncRequest(topic, "data " + std::to_string(i), reply, 1000)) {
+ // printf("client request failed\n");
+ // }
+ // ++count;
}
- printf("request %s %d done ", topic.c_str(), nreq);
+ do {
+ std::this_thread::yield();
+ } while (count.load() < nreq);
+ 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) {
- SocketReply server(shm);
- ProcInfo info;
- info.set_name(name);
- info.set_info(name);
- if (!server.Register(info, topics, 100)) {
- printf("register failed\n");
- }
- auto onData = [](const std::string &topic, const std::string &data, std::string &reply) {
- reply = topic + ':' + data;
+ DemoNode server(name, shm);
+
+ auto onData = [&](const std::string &proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply) {
+ ++server_msg_count;
+ reply.set_data(request.topic() + ':' + request.data());
return true;
};
- server.StartWorker(onData);
+ server.ServerStart(onData);
+
+ MsgTopicList rpc;
+ for (auto &topic : topics) {
+ rpc.add_topic_list(topic);
+ }
+ MsgCommonReply reply_body;
+ if (!server.ServerRegisterRPC(rpc, reply_body, 100)) {
+ printf("server register topic failed\n");
+ return;
+ }
+
while (run) {
std::this_thread::yield();
}
};
ThreadManager clients, servers;
- std::vector<std::string> topics = {"topic1", "topic2"};
+ 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 * 100);
}
clients.WaitAll();
+ 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