From 1f3729698a131b3f701f67adb6a1258aa1235dce Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 20 四月 2021 15:43:53 +0800
Subject: [PATCH] api server callback change tag to src; refactor.

---
 utest/utest.cpp |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/utest/utest.cpp b/utest/utest.cpp
index 572d8e5..b2de97f 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -102,7 +102,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 +125,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 +177,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());
 }
@@ -227,7 +227,9 @@
 		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;
@@ -244,7 +246,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 +256,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 +280,7 @@
 		}
 
 		while (run) {
-			std::this_thread::yield();
+			std::this_thread::sleep_for(100ms);
 		}
 	};
 	ThreadManager clients, servers;

--
Gitblit v1.8.0