From 056f71f24cefaf88f2a93714c6678c03ed5f1e0e Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 02 七月 2021 16:54:33 +0800
Subject: [PATCH] fixed to adapt gcc-5.4 & glibc-2.25
---
utest/utest.cpp | 224 ++++++++------------------------------------------------
1 files changed, 32 insertions(+), 192 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index 54c6d6f..60b490f 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,18 +1,33 @@
+#include "center.h"
#include "defs.h"
-#include "pubsub.h"
-#include "pubsub_center.h"
-#include "reqrep.h"
-#include "reqrep_center.h"
-#include "socket.h"
+#include "log.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>
#include <vector>
+
+namespace
+{
+bool InitLog()
+{
+ ns_log::AddLog("/tmp/bhshmq_test.log", true, true);
+ ns_log::ResetLogLevel(ns_log::LogLevel::debug);
+ return true;
+}
+static bool g_test_init_log = InitLog();
+} // namespace
+
+using namespace bhome_shm;
+using namespace bhome_msg;
+
+SharedMemory &TestShm()
+{
+ static SharedMemory shm("utest_0", 1024 * 1024 * 512);
+ return shm;
+}
template <class A, class B>
struct IsSameType {
@@ -25,193 +40,22 @@
BOOST_AUTO_TEST_CASE(Temp)
{
- std::string topics[] = {
- "",
- ".",
- "a",
- "sp",
- "sport",
- "sport.",
- "sport.a",
- "sport.a.b.c",
- "sport.ab.c",
- "sport.basketball",
- "sport.football",
- };
- const char sep = '.';
- auto Adjust = [&](const std::string &user_topic) {
- if (user_topic.empty() || user_topic.back() == sep) {
- return user_topic;
- } else {
- return user_topic + sep;
- }
- };
-
- for (auto &t : topics) {
- const std::string &a = Adjust(t);
- printf("orig: %20s adjusted: %20s parts:[", ("'" + t + "'").c_str(), ('\'' + a + '\'').c_str());
-
- size_t pos = 0;
- while (true) {
- auto &topic = t;
- pos = topic.find(kTopicSep, pos);
- if (pos == topic.npos || ++pos == topic.size()) {
- // Find1(std::string()); // sub all.
- break;
- } else {
- printf("'%s',", topic.substr(0, pos).c_str());
- }
- }
- printf("]\n");
- }
-}
-
-BOOST_AUTO_TEST_CASE(PubSubTest)
-{
- const std::string shm_name("ShmPubSub");
+ const std::string shm_name("ShmTemp");
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;
+ SharedMemory shm(shm_name, 1024 * 1024 * 10);
- PubSubCenter bus(shm);
- bus.Start();
-
- std::this_thread::sleep_for(100ms);
-
- 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 * 2;
- const int timeout = 1000;
- auto Sub = [&](int id, const std::vector<std::string> &topics) {
- SocketSubscribe client(shm);
- bool r = client.Subscribe(topics, timeout);
- std::mutex mutex;
- std::condition_variable cv;
-
- 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",
- total_count.load(), total_count - last_count.exchange(total_count), init_avail - Avail());
- }
- 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.StartRecv(OnTopicData, 1);
-
- std::unique_lock<std::mutex> lk(mutex);
- cv.wait(lk);
- };
-
- auto Pub = [&](const std::string &topic) {
- 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, timeout);
- if (!r) {
- printf("pub ret: %s\n", r ? "ok" : "fail");
- }
- }
- };
- ThreadManager threads;
- typedef std::vector<std::string> Topics;
- Topics topics;
- for (int i = 0; i < 100; ++i) {
- topics.push_back("t" + std::to_string(i));
- }
- Topics part;
- 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);
- for (auto &topic : topics) {
- threads.Launch(Pub, topic);
- }
- 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());
-
- bus.Stop();
-}
-
-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;
+ 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 (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_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;
- return true;
- };
- server.StartWorker(onData);
- while (run) {
+ for (auto &tp : tps) {
+ tp = clock::now();
std::this_thread::yield();
}
- };
- ThreadManager clients, servers;
- std::vector<std::string> 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)
-{
- printf("MyMin\n");
- return a < b ? a : b;
+ printf("time: %ld ns\n", (tps.back() - tps.front()).count());
}
int test_main(int argc, char *argv[])
@@ -220,10 +64,6 @@
int a = 0;
int b = 0;
BOOST_CHECK_EQUAL(a, b);
- int n = MyMin(4, 6);
- for (int i = 0; i < n; ++i) {
- printf("i = %d\n", i);
- }
return 0;
}
--
Gitblit v1.8.0