From 11f6c600e55ca5677f93624efe44d2605cdd908d Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 20:18:38 +0800
Subject: [PATCH] reserve #,@ prefix for internal proc id and topic.
---
utest/simple_tests.cpp | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/utest/simple_tests.cpp b/utest/simple_tests.cpp
index cbbcc2a..e9131b0 100644
--- a/utest/simple_tests.cpp
+++ b/utest/simple_tests.cpp
@@ -106,15 +106,14 @@
BOOST_AUTO_TEST_CASE(TimedWaitTest)
{
- const std::string shm_name("shm_wait");
- ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024 * 1024);
- ShmMsgQueue q(shm, 64);
+ SharedMemory &shm = TestShm();
+ GlobalInit(shm);
+ ShmMsgQueue q(shm, NewSession(), 64);
for (int i = 0; i < 2; ++i) {
int ms = i * 100;
printf("Timeout Test %4d: ", ms);
boost::timer::auto_cpu_timer timer;
- MsgI msg;
+ MsgI msg(shm);
bool r = q.Recv(msg, ms);
BOOST_CHECK(!r);
}
@@ -122,19 +121,19 @@
BOOST_AUTO_TEST_CASE(RefCountTest)
{
- const std::string shm_name("ShmRefCount");
- ShmRemover auto_remove(shm_name);
- SharedMemory shm(shm_name, 1024 * 1024);
+ SharedMemory &shm = TestShm();
+ typedef MsgI Msg;
+ GlobalInit(shm);
- MsgI m0(shm.Alloc(1000), shm.New<RefCount>());
- BOOST_CHECK(m0.IsCounted());
+ Msg m0(1000, shm);
+ BOOST_CHECK(m0.valid());
BOOST_CHECK_EQUAL(m0.Count(), 1);
- MsgI m1 = m0;
- BOOST_CHECK(m1.IsCounted());
+ Msg m1 = m0;
+ BOOST_CHECK(m1.valid());
BOOST_CHECK_EQUAL(m1.AddRef(), 2);
BOOST_CHECK_EQUAL(m0.AddRef(), 3);
- BOOST_CHECK_EQUAL(m0.Release(shm), 2);
- BOOST_CHECK_EQUAL(m0.Release(shm), 1);
- BOOST_CHECK_EQUAL(m1.Release(shm), 0);
- BOOST_CHECK(!m1.IsCounted());
+ BOOST_CHECK_EQUAL(m0.Release(), 2);
+ BOOST_CHECK_EQUAL(m0.Release(), 1);
+ BOOST_CHECK_EQUAL(m1.Release(), 0);
+ BOOST_CHECK(!m1.valid());
}
--
Gitblit v1.8.0