From 8cbb55f3066f71f5a4328193414d4555c87e96be Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 30 三月 2021 11:41:30 +0800
Subject: [PATCH] refactor.
---
utest/utest.cpp | 284 +++++++++++++++++---------------------------------------
1 files changed, 89 insertions(+), 195 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index 38d924f..b5acc3b 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -1,241 +1,135 @@
#include <stdio.h>
-#include "../src/shm.h"
-#include "../src/bh_util.h"
#include <string>
#include <vector>
#include <thread>
-#include <chrono>
#include <atomic>
-#include <boost/noncopyable.hpp>
-#include <boost/timer/timer.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/date_time/microsec_time_clock.hpp>
#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#include "pubsub.h"
+#include "defs.h"
+#include "util.h"
-using namespace std::chrono_literals;
-using namespace bhome_shm;
+template <class A, class B> struct IsSameType { static const bool value = false; };
+template <class A> struct IsSameType<A,A> { static const bool value = true; };
-struct s1000 { char a[1000]; };
-typedef std::function<void(void)> FuncVV;
-class ScopeCall : private boost::noncopyable {
- FuncVV f_;
-public:
- ScopeCall(FuncVV f):f_(f) { f_(); }
- ~ScopeCall() { f_(); }
-};
-class ThreadManager {
- std::vector<std::thread> threads_;
-public:
- ~ThreadManager() { WaitAll(); }
- template <class T, class...P>
- void Launch(T t, P...p) { threads_.emplace_back(t, p...); }
- void WaitAll() {
- for (auto &t : threads_) {
- if (t.joinable()) {
- t.join();
- }
- }
- }
-};
-class ProcessManager {
-
-};
-struct ShmRemover {
- std::string name_;
- ShmRemover(const std::string &name):name_(name) { SharedMemory::Remove(name_); }
- ~ShmRemover() { SharedMemory::Remove(name_); }
-};
-
-BOOST_AUTO_TEST_CASE(ShmBasic)
+BOOST_AUTO_TEST_CASE(ShmTest)
{
- const std::string shm_name("basic");
- ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024*1024*10);
-
- auto Avail = [&]() { return shm.get_free_memory(); };
- auto init_avail = Avail();
-
- auto BasicTest = [&](int tid, int nloop) {
- auto Code = [&](int id) {
-
- typedef ShmObject<s1000> Int;
- std::string name = std::to_string(id);
- auto a0 = Avail();
- Int i1(shm, name);
- auto a1 = Avail();
- BOOST_CHECK_LT(a1, a0);
- printf("s1000 size: %ld\n", a0 - a1);
- i1->a[0] = 5;
- Int i2(shm, name);
- auto a2 = Avail();
- BOOST_CHECK_EQUAL(a1, a2);
- BOOST_CHECK_EQUAL(i1.data(), i2.data());
- int i = i1.Remove();
- BOOST_CHECK_EQUAL(Avail(), a0);
-
- {
- auto old = Avail();
- void *p = shm.allocate(1024);
- shm.deallocate(p);
- BOOST_CHECK_EQUAL(old, Avail());
- }
-
- bool r = shared_memory_object::remove(shm_name.c_str());
- BOOST_CHECK(r);
- };
- boost::timer::auto_cpu_timer timer;
- for (int i = 0; i < nloop; ++i)
- {
- Code(i + tid*nloop);
- }
- };
-
- boost::timer::auto_cpu_timer timer;
- DEFER1(printf("Basic Test:"););
- ThreadManager threads;
- int nthread = 1;
- int nloop = 1;
- for (int i = 0; i < nthread; ++i)
+ const int size = 1024*1024;
+ const std::string shm_name("ShmRemoveTest");
+ SharedMemory m0(shm_name, size);
+ int *p = m0.find_or_construct<int>("abc")(100);
+ if (p) {
+ printf("*p = %d\n", *p);
+ ++*p;
+ }
{
- threads.Launch(BasicTest, i, nloop);
+ SharedMemory m1(shm_name, size);
+ m1.Remove();
+ // m1.Remove();
}
- printf("end\n");
- BOOST_CHECK_EQUAL(init_avail, Avail());
-}
-
-BOOST_AUTO_TEST_CASE(TimedWait)
-{
- const std::string shm_name("shm_wait");
- ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024*1024);
- ShmMsgQueue q(shm, 64);
- for (int i = 0; i < 5; ++i) {
- int ms = i * 100;
- printf("Timeout Test %d: ", ms);
- boost::timer::auto_cpu_timer timer;
- MQId id;
- void *data;
- size_t size;
- bool r = q.Recv(id, data, size, ms);
- BOOST_CHECK(!r);
+ if (p) {
+ printf("again *p = %d\n", *p);
+ // ++*p;
}
}
-BOOST_AUTO_TEST_CASE(MsgHeader)
+BOOST_AUTO_TEST_CASE(PubSubTest)
{
- MsgMetaV1 head;
- BOOST_CHECK_EQUAL(head.self_size_, sizeof(head));
- BOOST_CHECK_EQUAL(head.type_, kMsgTypeNormal);
- BOOST_CHECK_EQUAL(head.tag_, kMsgMetaTag);
- BOOST_CHECK_EQUAL(head.data_size_, 0);
- BOOST_CHECK_EQUAL(head.src_id_[5], 0);
-
- head.data_size_ = 100;
- auto rand_id = boost::uuids::random_generator()();
- memcpy(head.src_id_, &rand_id, sizeof(rand_id));
- head.type_ = 123;
-
- BOOST_CHECK_EQUAL(sizeof(head.src_id_), sizeof(rand_id));
-
- char buf[100] = {0};
- head.Pack(buf);
- MsgMetaV1 result;
- result.Parse(buf);
- BOOST_CHECK_EQUAL(memcmp(&head, &result, sizeof(head)), 0);
-
-}
-BOOST_AUTO_TEST_CASE(RequestReply)
-{
- const std::string shm_name("ShmReqRep");
- ShmRemover auto_remove(shm_name);
+ const std::string shm_name("ShmPubSub");
+ ShmRemover auto_remove(shm_name); //remove twice? in case of killed?
SharedMemory shm(shm_name, 1024*1024*50);
auto Avail = [&]() { return shm.get_free_memory(); };
auto init_avail = Avail();
- // DEFER1(BOOST_CHECK_EQUAL(init_avail, Avail()); printf("Request Reply Test shm No Leak.\n"););
- auto f0 = init_avail;
- const int qlen = 64;
- ShmMsgQueue srv(shm, qlen);
- ShmMsgQueue cli(shm, qlen);
- auto f1= shm.get_free_memory();
+ BusManager bus(shm);
+ bus.Start(1);
+ std::this_thread::sleep_for(100ms);
- const size_t msg_length = 1000;
- std::string msg_content(msg_length, 'a');
- msg_content[20] = '\0';
- std::atomic<bool> stop(false);
std::atomic<uint64_t> count(0);
- using namespace boost::posix_time;
- auto Now = []() { return second_clock::universal_time(); };
- std::atomic<ptime> last_time(Now());
+ std::atomic<ptime> last_time(Now() - seconds(1));
std::atomic<uint64_t> last_count(0);
- auto Client = [&](int tid, int nmsg){
- for (int i = 0; i < nmsg; ++i) {
- if (!cli.Send(srv.Id(), msg_content.data(), msg_content.size(), 1000)) {
- printf("********** client send error.\n");
- continue;
- }
- MQId id;
- void *data = 0;
- size_t size = 0;
- if (!cli.Recv(id, data, size, 1000)) {
- printf("********** client recv error.\n");
- } else {
- DEFER1(free(data));
- if(size != msg_length) {
+ const uint64_t nmsg = 1000 * 100;
+
+ const int timeout = 1000;
+ auto Sub = [&](int id, const std::vector<std::string> &topics) {
+ ShmMsgQueue client(shm, 8);
+ client.Send(kBHBusQueueId, MakeSub(client.Id(), topics), timeout);
+ for (int i = 0; i < nmsg * topics.size(); ++i) {
+ BHMsg msg;
+ if (client.Recv(msg, 1000)) {
+ if (msg.type() != kMsgTypePublish) {
+ BOOST_CHECK(false);
+ }
+ DataPub pub;
+ if (!pub.ParseFromString(msg.body())) {
BOOST_CHECK(false);
}
++count;
auto cur = Now();
- if (last_time.exchange(cur) != cur) {
- std::cout << "time: " << Now();
- printf(", total msg:%10ld, speed:%8ld, used mem:%8ld\n", count.load(), count - last_count.exchange(count), init_avail - Avail());
- last_time = cur;
+ 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());
}
+ // printf("sub %2d recv: %s/%s\n", id, pub.topic().c_str(), pub.data().c_str());
+ } else {
+ printf("sub %2d recv timeout\n", id);
+ }
+
+ }
+ };
+ auto Pub = [&](const std::string &topic) {
+ ShmMsgQueue provider(shm, 0);
+ for (int i = 0; i < nmsg; ++i) {
+ std::string data = topic + std::to_string(i);
+ bool r = provider.Send(kBHBusQueueId, MakePub(topic, data.data(), data.size()), timeout);
+ if (!r) {
+ printf("pub ret: %s\n", r ? "ok" : "fail");
}
}
};
+ ThreadManager threads;
+ typedef std::vector<std::string> Topics;
+ Topics topics;
+ topics.push_back("000-xxx");
+ topics.push_back("111-football");
+ topics.push_back("222-sport");
+ // topics.push_back("333-sport");
+ // topics.push_back("444-sport");
+ Topics part;
+ for (int i = 0; i < topics.size(); ++i) {
+ part.push_back(topics[i]);
+ threads.Launch(Sub, i, part);
+ }
+ std::this_thread::sleep_for(100ms);
+ for (auto &topic: topics) {
+ threads.Launch(Pub, topic);
+ }
+ threads.Launch(Pub, "some_else");
- auto Server = [&](){
- void *data = 0;
- size_t size = 0;
- MQId src_id;
- while (!stop) {
- if (srv.Recv(src_id, data, size, 100)) {
- DEFER1(free(data));
- if (srv.Send(src_id, data, size, 100)) {
- if (size != msg_content.size()) {
- BOOST_TEST(false, "server msg size error");
- }
- }
- }
- }
- };
+ threads.WaitAll();
- boost::timer::auto_cpu_timer timer;
- DEFER1(printf("Request Reply Test:"););
-
- ThreadManager clients, servers;
- for (int i = 0; i < qlen; ++i) { servers.Launch(Server); }
- int ncli = 100;
- uint64_t nmsg = 1000*10;
- printf("client threads: %d, msgs : %ld, total msg: %ld\n", ncli, nmsg, ncli * nmsg);
- for (int i = 0; i < ncli; ++i) { clients.Launch(Client, i, nmsg); }
- clients.WaitAll();
- printf("request ok: %ld\n", count.load());
- stop = true;
- servers.WaitAll();
+ bus.Stop();
}
+inline int MyMin(int a, int b) {
+ printf("MyMin\n");
+ return a < b ? a : b;
+}
int test_main(int argc, char *argv[])
{
printf("test main\n");
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