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 | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index f127a8f..817cbaf 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,6 +1,5 @@
#include "center.h"
#include "defs.h"
-#include "failed_msg.h"
#include "util.h"
#include <atomic>
#include <boost/uuid/uuid_generators.hpp>
@@ -21,8 +20,6 @@
struct IsSameType<A, A> {
static const bool value = true;
};
-
-typedef FailedMsgQ ServerFailedQ;
BOOST_AUTO_TEST_CASE(Temp)
{
@@ -124,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();
@@ -149,8 +146,10 @@
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) {
static std::atomic<int> an(0);
int n = ++an;
@@ -218,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());
}
@@ -227,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;
}
@@ -248,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);
--
Gitblit v1.8.0