From c28cdf2fbf1565709b359c9cca6c5e29d9592dce Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 02 四月 2021 15:51:20 +0800
Subject: [PATCH] typedef Topic.

---
 utest/utest.cpp |  120 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/utest/utest.cpp b/utest/utest.cpp
index 473b04e..637ae26 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,10 +1,14 @@
 #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>
 #include <boost/uuid/uuid_io.hpp>
+#include <condition_variable>
 #include <stdio.h>
 #include <string>
 #include <thread>
@@ -21,7 +25,7 @@
 
 BOOST_AUTO_TEST_CASE(Temp)
 {
-	std::string topics[] = {
+	Topic topics[] = {
 	    "",
 	    ".",
 	    "a",
@@ -67,73 +71,70 @@
 	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());
 	auto Avail = [&]() { return shm.get_free_memory(); };
 	auto init_avail = Avail();
+	int *flag = shm.find_or_construct<int>("flag")(123);
+	printf("flag = %d\n", *flag);
+	++*flag;
 
-	BusManager bus(shm);
-	bus.Start(1);
+	PubSubCenter bus(shm);
+	bus.Start();
+
 	std::this_thread::sleep_for(100ms);
 
-	std::atomic<uint64_t> count(0);
+	std::atomic<uint64_t> total_count(0);
 	std::atomic<ptime> last_time(Now() - seconds(1));
 	std::atomic<uint64_t> last_count(0);
 
-	const uint64_t nmsg = 100;
+	const uint64_t nmsg = 100 * 2;
 	const int timeout = 1000;
 	auto Sub = [&](int id, const std::vector<std::string> &topics) {
-		ShmSocket client(ShmSocket::eSockSubscribe, shm);
+		SocketSubscribe client(shm);
 		bool r = client.Subscribe(topics, timeout);
 		std::mutex mutex;
 		std::condition_variable cv;
 
-		int i = 0;
-		auto OnRecv = [&](BHMsg &msg) {
-			if (msg.type() != kMsgTypePublish) {
-				BOOST_CHECK(false);
-			}
-			DataPub pub;
-			if (!pub.ParseFromString(msg.body())) {
-				BOOST_CHECK(false);
-			}
-			++count;
+		std::atomic<uint64_t> n(0);
+		auto OnTopicData = [&](const std::string &topic, const std::string &data) {
+			++total_count;
 
 			auto cur = Now();
 			if (last_time.exchange(cur) < cur) {
 				std::cout << "time: " << cur;
 				printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
-				       count.load(), count - last_count.exchange(count), init_avail - Avail());
+				       total_count.load(), total_count - last_count.exchange(total_count), init_avail - Avail());
 			}
-			if (++i >= nmsg * topics.size()) {
+			if (++n >= nmsg * topics.size()) {
 				cv.notify_one();
 			}
 			// printf("sub %2d recv: %s/%s\n", id, pub.topic().c_str(), pub.data().c_str());
 		};
-		client.SetRecvCallback(OnRecv);
+		client.StartRecv(OnTopicData, 1);
 
 		std::unique_lock<std::mutex> lk(mutex);
 		cv.wait(lk);
 	};
 
 	auto Pub = [&](const std::string &topic) {
-		ShmSocket provider(ShmSocket::eSockPublish, shm);
-		for (int i = 0; i < nmsg; ++i) {
+		SocketPublish provider(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.data(), data.size(), timeout);
-			// bool r = provider.Send(kBHBusQueueId, MakePub(topic, data.data(), data.size()), timeout);
+			bool r = provider.Publish(topic, data, timeout);
 			if (!r) {
 				printf("pub ret: %s\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;
-	for (int i = 0; i < topics.size(); ++i) {
+	for (size_t i = 0; i < topics.size(); ++i) {
 		part.push_back(topics[i]);
 		threads.Launch(Sub, i, topics);
 	}
@@ -146,10 +147,77 @@
 	threads.WaitAll();
 	std::cout << "end : " << Now();
 	printf("sub recv, total msg:%10ld, speed:[%8ld/s], used mem:%8ld \n",
-	       count.load(), count - last_count.exchange(count), init_avail - Avail());
+	       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)
+{
+	const std::string shm_name("ShmReqRep");
+	ShmRemover auto_remove(shm_name);
+	SharedMemory shm(shm_name, 1024 * 1024 * 50);
+
+	auto Avail = [&]() { return shm.get_free_memory(); };
+	auto init_avail = Avail();
+	int *flag = shm.find_or_construct<int>("flag")(123);
+	printf("flag = %d\n", *flag);
+	++*flag;
+
+	ReqRepCenter center(shm);
+	center.Start(2);
+	std::atomic<bool> run(true);
+
+	auto Client = [&](const std::string &topic, const int nreq) {
+		SocketRequest client(shm);
+		std::string reply;
+		boost::timer::auto_cpu_timer timer;
+		for (int i = 0; i < nreq; ++i) {
+			if (!client.SyncRequest(topic, "data " + std::to_string(i), reply, 1000)) {
+				printf("client request failed\n");
+			}
+		}
+		printf("request %s %d done ", topic.c_str(), nreq);
+	};
+	auto Server = [&](const std::string &name, const std::vector<std::string> &topics) {
+		SocketReply server(shm);
+		ProcInfo info;
+		info.set_id(name);
+		info.set_name(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;
+			return true;
+		};
+		server.StartWorker(onData);
+		while (run) {
+			std::this_thread::yield();
+		}
+	};
+	ThreadManager clients, servers;
+	std::vector<Topic> topics = {"topic1", "topic2"};
+	servers.Launch(Server, "server", topics);
+	std::this_thread::sleep_for(100ms);
+	for (auto &t : topics) {
+		clients.Launch(Client, t, 1000 * 100);
+	}
+	clients.WaitAll();
+	run = false;
+	servers.WaitAll();
+}
 
 inline int MyMin(int a, int b)
 {

--
Gitblit v1.8.0