From 3998ca8b875e99b0cfdf7735f7f0fb6acb5cf3e7 Mon Sep 17 00:00:00 2001 From: wonghiu45 Date: Tue, 1 Nov 2022 16:05:29 +0800 Subject: [PATCH] remove pthread cancel category:bugfix issue:#I5Y3FI Signed-off-by: wonghiu45 Change-Id: Ic3b773729b9092aa380c597017ecc0b6cb904d68 --- libpurgeablemem/test/purgeable_c_test.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/libpurgeablemem/test/purgeable_c_test.cpp b/libpurgeablemem/test/purgeable_c_test.cpp index 50611cc..d46d177 100644 --- a/libpurgeablemem/test/purgeable_c_test.cpp +++ b/libpurgeablemem/test/purgeable_c_test.cpp @@ -110,9 +110,7 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1) const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\0"; struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); - std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); - pthread_t reclaimPid = reclaimThread.native_handle(); - reclaimThread.detach(); + LoopReclaimPurgeable(1); unsigned int loopCount = 3; /* loop read content */ @@ -125,7 +123,6 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1) PurgMemEndRead(pobj); } - pthread_cancel(reclaimPid); /* destroy reclaimThread */ PurgMemDestroy(pobj); } @@ -134,9 +131,7 @@ HWTEST_F(PurgeableCTest, WriteTest, TestSize.Level1) const char alphabet[] = "CCCDEFGHIJKLMNOPQRSTUVWXYZ\0"; struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); - std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); - pthread_t reclaimPid = reclaimThread.native_handle(); - reclaimThread.detach(); + LoopReclaimPurgeable(1); struct AlphabetModifyParam a2b = {'A', 'B'}; struct AlphabetModifyParam b2c = {'B', 'C'}; @@ -150,7 +145,6 @@ HWTEST_F(PurgeableCTest, WriteTest, TestSize.Level1) std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; } - pthread_cancel(reclaimPid); /* destroy reclaimThread */ PurgMemDestroy(pobj); LoopReclaimPurgeable(3); } @@ -160,14 +154,8 @@ HWTEST_F(PurgeableCTest, ReadWriteTest, TestSize.Level1) const char alphabet[] = "DDDDEFGHIJKLMNOPQRSTUVWXYZ\0"; struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); - /* loop reclaim thread */ - std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); - pthread_t reclaimPid = reclaimThread.native_handle(); - reclaimThread.detach(); - /* loop read thread */ - std::thread readThread(LoopPrintAlphabet, pobj, UINT_MAX); - pthread_t readPid = readThread.native_handle(); - readThread.detach(); + LoopReclaimPurgeable(1); + LoopPrintAlphabet(pobj, 1); struct AlphabetModifyParam a2b = {'A', 'B'}; struct AlphabetModifyParam b2c = {'B', 'C'}; @@ -183,8 +171,6 @@ HWTEST_F(PurgeableCTest, ReadWriteTest, TestSize.Level1) std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; } - pthread_cancel(reclaimPid); /* destroy reclaimThread */ - pthread_cancel(readPid); /* destroy readThread */ PurgMemDestroy(pobj); } -- Gitee