From 2910379ef43bad1819443180336f041b4f2d2564 Mon Sep 17 00:00:00 2001 From: fchn289 Date: Fri, 27 Oct 2023 16:14:20 +0800 Subject: [PATCH] ut: replace mt_waker_ by g_sem --- ut/thread/MtInQueueTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ut/thread/MtInQueueTest.cpp b/ut/thread/MtInQueueTest.cpp index 6d718c1..05d0cdc 100644 --- a/ut/thread/MtInQueueTest.cpp +++ b/ut/thread/MtInQueueTest.cpp @@ -14,6 +14,7 @@ #include "UniLog.hpp" #define MT_IN_Q_TEST +#include "MT_PingMainTH.hpp" #include "MtInQueue.hpp" #undef MT_IN_Q_TEST @@ -39,12 +40,11 @@ struct MtInQueueTest : public Test, public UniLog // ------------------------------------------------------------------------------------------- MtInQueue mtQ_; - MT_Semaphore mt_waker_; }; #define FIFO // *********************************************************************************************** -TEST_F(MtInQueueTest, GOLD_simple_fifo_without_waker) +TEST_F(MtInQueueTest, GOLD_simple_fifo) { MtInQueue mtQ; mtQ.mt_push(make_shared(1)); @@ -69,7 +69,7 @@ TEST_F(MtInQueueTest, GOLD_sparsePush_fifo) { auto msg = mtQ_.pop(); if (msg) ASSERT_EQ(nHdl++, *msg) << "REQ: fifo"; - else mt_waker_.mt_timedwait(); // REQ: less CPU than repeat pop() or this_thread::yield() + else g_sem.mt_timedwait(); // REQ: less CPU than repeat pop() or this_thread::yield() } INF("REQ(sleep 1us/push): e2e user=0.354s->0.123s, sys=0.412s->0.159s") } @@ -114,7 +114,7 @@ TEST_F(MtInQueueTest, size_and_nowait) { mtQ_.mt_push(make_shared(1)); ASSERT_EQ(1u, mtQ_.mt_size()) << "REQ: inc size" << endl; - mt_waker_.mt_timedwait(); + g_sem.mt_timedwait(); ASSERT_EQ(1u, mtQ_.mt_size()) << "REQ: wait() ret immediately since mtQ_ not empty" << endl; mtQ_.mt_push(make_shared(2)); @@ -122,11 +122,11 @@ TEST_F(MtInQueueTest, size_and_nowait) EXPECT_EQ(1, *(mtQ_.pop())) << "REQ: fifo"; ASSERT_EQ(1u, mtQ_.mt_size()) << "REQ: dec size" << endl; - mt_waker_.mt_timedwait(); + g_sem.mt_timedwait(); ASSERT_EQ(1u, mtQ_.mt_size()) << "REQ: wait() ret immediately since mtQ_ not empty" << endl; mtQ_.mt_push(make_shared(3)); - mt_waker_.mt_timedwait(); + g_sem.mt_timedwait(); ASSERT_EQ(2u, mtQ_.mt_size()) << "REQ: wait() ret immediately since mtQ_ not empty" << endl; EXPECT_EQ(2, *(mtQ_.pop())) << "REQ: keep fifo after wait_for()";