From 5ea16d3ada367a956e6e60a7ede32191922c82da Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 17 Dec 2024 19:27:22 +0800 Subject: [PATCH] ut: minor changes --- source/os/test/osThreadTests.cpp | 34 +++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/source/os/test/osThreadTests.cpp b/source/os/test/osThreadTests.cpp index 4badfcdb4d..221c53cbc3 100644 --- a/source/os/test/osThreadTests.cpp +++ b/source/os/test/osThreadTests.cpp @@ -34,7 +34,6 @@ static int32_t globalVar = 0; static void funcPtrKey(void *param) { taosMsleep(100); } static void *funcPtr200(void *param) { - taosMsleep(200); TdThread thread = taosThreadSelf(); TdThreadKey key = {0}; @@ -58,6 +57,7 @@ static void *funcPtr200(void *param) { taosThreadGetSchedParam(thread, &policy, NULL); // taosThreadSetSchedParam(NULL, 0, ¶); taosThreadSetSchedParam(thread, 0, ¶); + taosMsleep(200); return NULL; } @@ -107,6 +107,8 @@ TEST(osThreadTests, thread) { EXPECT_NE(reti, 0); reti = taosThreadCreate(&tid1, NULL, funcPtr200, NULL); EXPECT_EQ(reti, 0); + taosMsleep(300); + reti = taosThreadCancel(tid1); EXPECT_EQ(reti, 0); @@ -289,6 +291,9 @@ TEST(osThreadTests, cond) { reti = taosThreadCondAttrGetPshared(&condattr, NULL); EXPECT_NE(reti, 0); + reti = taosThreadCondAttrSetclock(NULL, -1); + EXPECT_NE(reti, 0); + reti = taosThreadCondAttrDestroy(NULL); EXPECT_NE(reti, 0); reti = taosThreadCondAttrDestroy(&condattr); @@ -399,6 +404,33 @@ TEST(osThreadTests, rwlock) { EXPECT_NE(reti, 0); reti = taosThreadRwlockDestroy(&rwlock); EXPECT_EQ(reti, 0); + + reti = taosThreadRwlockInit(NULL, 0); + EXPECT_NE(reti, 0); + reti = taosThreadRwlockInit(&rwlock, 0); + EXPECT_EQ(reti, 0); + + reti = taosThreadRwlockTryWrlock(NULL); + EXPECT_NE(reti, 0); + reti = taosThreadRwlockTryWrlock(&rwlock); + EXPECT_EQ(reti, 0); + + reti = taosThreadRwlockUnlock(NULL); + EXPECT_NE(reti, 0); + reti = taosThreadRwlockUnlock(&rwlock); + EXPECT_EQ(reti, 0); + + reti = taosThreadRwlockWrlock(NULL); + EXPECT_NE(reti, 0); + reti = taosThreadRwlockWrlock(&rwlock); + EXPECT_EQ(reti, 0); + reti = taosThreadRwlockUnlock(&rwlock); + EXPECT_EQ(reti, 0); + + reti = taosThreadRwlockDestroy(NULL); + EXPECT_NE(reti, 0); + reti = taosThreadRwlockDestroy(&rwlock); + EXPECT_EQ(reti, 0); } TEST(osThreadTests, rdlockAttr) {