From 5e4ba1f7a580844fee1434c97fedc63baa22e0dd Mon Sep 17 00:00:00 2001 From: wujianlin Date: Fri, 29 Dec 2023 06:46:44 +0000 Subject: [PATCH] Rename variables and do not reuse names in nested scopes Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/I8SCFC?from=project-issue Signed-off-by: wujianlin --- .../safe_block_queue_benchmark_test.cpp | 12 ++++++------ .../safe_block_queue_tracking_benchmark_test.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp index 3a99d63..5288abf 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp @@ -425,8 +425,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndBlockInfullq AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertEqual(ungetedOut, static_cast(0), "ungetedOut did not equal static_cast(0) as expected.", state); - for (auto& t : threads) { - t.join(); + for (auto& singleThread : threads) { + singleThread.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { demoDatas[0].Get(); @@ -633,11 +633,11 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndPopInfullque GetThreadDatePushedStatus(demoDatas, pushedIn, unpushedIn); AssertEqual(pushedIn, THREAD_NUM, "pushedIn did not equal THREAD_NUM as expected.", state); AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); - for (auto& t : threadsout) { - t.join(); + for (auto& outThread : threadsout) { + outThread.join(); } - for (auto& t : threadsin) { - t.join(); + for (auto& inThread : threadsin) { + inThread.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { demoDatas[0].Get(); diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp index 6184d9f..5b6ecad 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp @@ -632,11 +632,11 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, testMutilthreadConcurrentGetAndPopI AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertFalse((demoDatas[0].joinStatus), "step 2: demoDatas[0].joinStatus did not equal false.", state); demoDatas[0].joinStatus = false; - for (auto& t : threadsout) { - t.join(); + for (auto& outThread : threadsout) { + outThread.join(); } - for (auto& t : threadsin) { - t.join(); + for (auto& inThread : threadsin) { + inThread.join(); } processSharedQueueTasks(demoDatas[0]); joinThread.join(); -- Gitee