From d3e7f93e69cb24c766292d8780e745caf24d42a8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 25 三月 2021 18:30:51 +0800
Subject: [PATCH] add ref count.
---
utest/utest.cpp | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/utest/utest.cpp b/utest/utest.cpp
index 61e6437..6994cbd 100644
--- a/utest/utest.cpp
+++ b/utest/utest.cpp
@@ -145,21 +145,15 @@
SharedMemory shm(shm_name, 1024*1024);
Msg m0(shm.Alloc(1000), shm.New<RefCount>());
- BOOST_CHECK_EQUAL(m0.AddRef(), 1);
+ BOOST_CHECK(m0.IsCounted());
+ BOOST_CHECK_EQUAL(m0.Count(), 1);
Msg m1 = m0;
+ BOOST_CHECK(m1.IsCounted());
BOOST_CHECK_EQUAL(m1.AddRef(), 2);
BOOST_CHECK_EQUAL(m0.AddRef(), 3);
BOOST_CHECK_EQUAL(m0.RemoveRef(), 2);
BOOST_CHECK_EQUAL(m0.RemoveRef(), 1);
BOOST_CHECK_EQUAL(m1.RemoveRef(), 0);
- {
- Msg::CountGuard guard(m0);
- BOOST_CHECK_EQUAL(m1.AddRef(), 2);
- {
- Msg::CountGuard guard(m0);
- BOOST_CHECK_EQUAL(m1.RemoveRef(), 2);
- }
- }
BOOST_CHECK_EQUAL(m1.Count(), 0);
}
@@ -201,16 +195,23 @@
const size_t msg_length = 1000;
std::string msg_content(msg_length, 'a');
msg_content[20] = '\0';
+ Msg request;
+ request.Build(shm, cli.Id(), msg_content.data(), msg_content.size(), true);
+ Msg reply(request);
+
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)) {
+ auto Send = [&]() { return cli.Send(srv.Id(), msg_content.data(), msg_content.size(), 1000); };
+ auto SendRefCounted = [&]() { return cli.Send(srv.Id(), request, 1000); };
+
+ if (!Send()) {
printf("********** client send error.\n");
continue;
}
@@ -228,7 +229,8 @@
auto cur = Now();
if (last_time.exchange(cur) != cur) {
std::cout << "time: " << Now();
- printf(", total msg:%10ld, speed:%8ld/s, used mem:%8ld\n", count.load(), count - last_count.exchange(count), init_avail - Avail());
+ printf(", total msg:%10ld, speed:%8ld/s, used mem:%8ld, refcount:%d\n",
+ count.load(), count - last_count.exchange(count), init_avail - Avail(), request.Count());
last_time = cur;
}
@@ -243,7 +245,10 @@
while (!stop) {
if (srv.Recv(src_id, data, size, 100)) {
DEFER1(free(data));
- if (srv.Send(src_id, data, size, 100)) {
+ auto Send = [&](){ return srv.Send(src_id, data, size, 100); };
+ auto SendRefCounted = [&](){ return srv.Send(src_id, reply, 100); };
+
+ if (SendRefCounted()) {
if (size != msg_content.size()) {
BOOST_TEST(false, "server msg size error");
}
@@ -257,14 +262,22 @@
ThreadManager clients, servers;
for (int i = 0; i < qlen; ++i) { servers.Launch(Server); }
- int ncli = 100;
- uint64_t nmsg = 1000*10;
+ int ncli = 100*1;
+ uint64_t nmsg = 100*100;
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();
+ BOOST_CHECK(request.IsCounted());
+ BOOST_CHECK_EQUAL(request.Count(), 1);
+ BOOST_CHECK(reply.IsCounted());
+ BOOST_CHECK_EQUAL(reply.Count(), 1);
+ if (request.RemoveRef() == 0) {
+ BOOST_CHECK_EQUAL(reply.Count(), 0);
+ request.FreeFrom(shm);
+ }
}
int test_main(int argc, char *argv[])
--
Gitblit v1.8.0