ut: replace mt_waker_ by g_sem

nokia · Oct 27, 2023 · 2910379 · 2910379
1 parent 6a48b3c
commit 2910379
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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<int>(make_shared<int>(1));
@@ -69,7 +69,7 @@ TEST_F(MtInQueueTest, GOLD_sparsePush_fifo)
     {
         auto msg = mtQ_.pop<int>();
         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,19 +114,19 @@ TEST_F(MtInQueueTest, size_and_nowait)
 {
     mtQ_.mt_push<int>(make_shared<int>(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<int>(make_shared<int>(2));
     ASSERT_EQ(2u, mtQ_.mt_size())  << "REQ: inc size"  << endl;
 
     EXPECT_EQ(1, *(mtQ_.pop<int>())) << "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<int>(make_shared<int>(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<int>())) << "REQ: keep fifo after wait_for()";