From 786f409a89c6209d8da6edc001e8c832502690e8 Mon Sep 17 00:00:00 2001 From: wujianlin Date: Sat, 23 Mar 2024 08:58:47 +0000 Subject: [PATCH] Reduce the repetition rate of the c_utils Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/I9AZFS?from=project-issue Signed-off-by: wujianlin --- .../datatime_benchmark_test.cpp | 15 +-- .../directory_benchmark_test.cpp | 15 +-- .../event_benchmark_test.cpp | 4 +- .../file_benchmark_test.cpp | 15 +-- .../observer_benchmark_test.cpp | 15 +-- .../parcel_benchmark_test.cpp | 15 +-- .../refbase_benchmark_test.cpp | 4 +- .../rwlock_benchmark_test.cpp | 15 +-- .../safe_block_queue_benchmark_test.cpp | 100 +++++++++--------- ...fe_block_queue_tracking_benchmark_test.cpp | 28 ++--- .../safe_map_benchmark_test.cpp | 7 +- .../singleton_benchmark_test.cpp | 15 +-- .../sorted_vector_benchmark_test.cpp | 15 +-- .../string_benchmark_test.cpp | 15 +-- .../thread_benchmark_test.cpp | 15 +-- .../thread_pool_benchmark_test.cpp | 15 +-- 16 files changed, 159 insertions(+), 149 deletions(-) diff --git a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp index 2f98a12..0e418c4 100644 --- a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp +++ b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp @@ -26,22 +26,23 @@ namespace { class BenchmarkDateTimeTest : public benchmark::Fixture { public: - BenchmarkDateTimeTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkDateTimeTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkDateTimeTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkDateTimeTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp index 7a40c95..efac76f 100644 --- a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp +++ b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp @@ -29,22 +29,23 @@ namespace { class BenchmarkDirectoryTest : public benchmark::Fixture { public: - BenchmarkDirectoryTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkDirectoryTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkDirectoryTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkDirectoryTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp index 53b68c4..1a42298 100644 --- a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp +++ b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp @@ -1048,7 +1048,7 @@ int64_t CurMs() std::atomic g_data1(0); void TimeOutCallback1() { - g_data1 += 1; + g_data1 = g_data1 + 1; } std::atomic g_data2(0); @@ -1141,7 +1141,7 @@ public: private: void TimeOutProc() { - data_ -= 1; + data_ = data_ - 1; }; int data_; Timer timer_; diff --git a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp index b14837d..8edbd2c 100644 --- a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp +++ b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp @@ -37,22 +37,23 @@ static constexpr int EXCEEDS_MAXIMUM_LENGTH = 32 * 1024 * 1024 + 1; class BenchmarkFileTest : public benchmark::Fixture { public: - BenchmarkFileTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkFileTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkFileTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkFileTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp index 1877e95..9a8ecda 100644 --- a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp +++ b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp @@ -27,22 +27,23 @@ namespace { class BenchmarkObserverTest : public benchmark::Fixture { public: - BenchmarkObserverTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkObserverTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkObserverTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkObserverTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp index 4974c60..4e1eeee 100644 --- a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp +++ b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp @@ -45,22 +45,23 @@ static constexpr int32_t WRITE_AND_CMP_INT32_VALUE = 5; class BenchmarkParcelTest : public benchmark::Fixture { public: - BenchmarkParcelTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkParcelTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkParcelTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkParcelTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp index f151d19..bb3f055 100644 --- a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp +++ b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp @@ -1297,7 +1297,7 @@ BENCHMARK_F(BenchmarkRefbaseTest, testWptrefbase001)(benchmark::State& state) // test wptr::wptr(const sptr&) sptr testOrigSptrObject(new WptrTest()); AssertEqual(testOrigSptrObject->GetSptrRefCount(), EXPECTED_REF_COUNT_ONE, - "testOrigSptrObject->GetSptrRefCount() did not equal EXPECTED_REF_COUNT_ONE", state); + "testOrigSptrObject->GetSptrRefCount() did not equal EXPECTED_REF_COUNT_ONE as expected.", state); wptr testTargetWptrObject3(testOrigSptrObject); CompOrigSptrAndTarWptr002(testOrigSptrObject, testTargetWptrObject3, EXPECTED_REF_COUNT_TWO, state); @@ -1305,7 +1305,7 @@ BENCHMARK_F(BenchmarkRefbaseTest, testWptrefbase001)(benchmark::State& state) // test wptr::operator=(const sptr&) wptr testTargetWptrObject4(new WptrTest()); AssertEqual(testTargetWptrObject4->GetWptrRefCount(), EXPECTED_REF_COUNT_ONE, - "testTargetWptrObject4->GetWptrRefCount() did not equal EXPECTED_REF_COUNT_ONE", state); + "testTargetWptrObject4->GetWptrRefCount() did not equal EXPECTED_REF_COUNT_ONE as expected.", state); testTargetWptrObject4 = testOrigSptrObject; CompOrigSptrAndTarWptr002(testOrigSptrObject, testTargetWptrObject4, EXPECTED_REF_COUNT_THREE, state); diff --git a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp index 866468d..7711276 100644 --- a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp +++ b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp @@ -26,22 +26,23 @@ namespace { class BenchmarkRWLockTest : public benchmark::Fixture { public: - BenchmarkRWLockTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkRWLockTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkRWLockTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkRWLockTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; 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 6d0a55a..0570adc 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 @@ -30,22 +30,23 @@ namespace { class BenchmarkSafeBlockQueue : public benchmark::Fixture { public: - BenchmarkSafeBlockQueue() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkSafeBlockQueue() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkSafeBlockQueue() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkSafeBlockQueue() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 100; @@ -66,18 +67,17 @@ public: static SafeBlockQueue shareQueue; bool putStatus; bool getStatus; + void Get() + { + shareQueue.Pop(); + getStatus = true; + } void Put(int i) { shareQueue.Push(i); putStatus = true; } - - void Get() - { - shareQueue.Pop(); - getStatus = true; - } }; SafeBlockQueue DemoThreadData::shareQueue(QUEUE_SLOTS); @@ -87,30 +87,30 @@ void PutHandleThreadData(DemoThreadData& q, int i) q.Put(i); } -void GetThreadDatePushedStatus(std::array& demoDatas, unsigned int& pushedIn, - unsigned int& unpushedIn) +void GetThreadDateGetedStatus(std::array& demoDatas, unsigned int& getedOut, + unsigned int& ungetedOut) { - pushedIn = 0; - unpushedIn = 0; + ungetedOut = 0; + getedOut = 0; for (auto& t : demoDatas) { - if (t.putStatus) { - pushedIn++; + if (t.getStatus) { + getedOut++; } else { - unpushedIn++; + ungetedOut++; } } } -void GetThreadDateGetedStatus(std::array& demoDatas, unsigned int& getedOut, - unsigned int& ungetedOut) +void GetThreadDatePushedStatus(std::array& demoDatas, unsigned int& pushedIn, + unsigned int& unpushedIn) { - getedOut = 0; - ungetedOut = 0; + unpushedIn = 0; + pushedIn = 0; for (auto& t : demoDatas) { - if (t.getStatus) { - getedOut++; + if (t.putStatus) { + pushedIn++; } else { - ungetedOut++; + unpushedIn++; } } } @@ -137,6 +137,22 @@ auto GetTimeOfSleepTwentyMillisecond() return timeT; } +static void QueuePushFullEquivalent(const int Equivalent, benchmark::State& state) +{ + for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { + DemoThreadData::shareQueue.Push(Equivalent); + } + AssertTrue((DemoThreadData::shareQueue.IsFull()), "shareQueue.IsFull() did not equal true.", state); +} + +static void QueuePushInnotfullNotEquivalent(const unsigned int remain) +{ + for (unsigned int i = 0; i < QUEUE_SLOTS - remain; i++) { + int t = i; + DemoThreadData::shareQueue.Push(t); + } +} + /* * @tc.name: testPut001 * @tc.desc: Single-threaded call put and get to determine that the normal scenario @@ -290,7 +306,7 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentPutAndBlockInfullq GetThreadDatePushedStatus(demoDatas, pushedIn, unpushedIn); AssertEqual(pushedIn, static_cast(0), "pushedIn did not equal static_cast(0) as expected.", state); - AssertEqual(unpushedIn, THREAD_NUM, "unpushedIn did not equal THREAD_NUM as expected.", state); + AssertEqual(unpushedIn, THREAD_NUM, "unpushedIn did not equal THREAD_NUM.", state); AssertTrue((DemoThreadData::shareQueue.IsFull()), "DemoThreadData::shareQueue.IsFull() did not equal true as expected.", state); for (unsigned int i = 0; i < THREAD_NUM; i++) { @@ -379,11 +395,7 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndBlockInfullq AssertTrue((DemoThreadData::shareQueue.IsEmpty()), "DemoThreadData::shareQueue.IsEmpty() did not equal true as expected.", state); int t = 1; - for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { - DemoThreadData::shareQueue.Push(t); - } - AssertTrue((DemoThreadData::shareQueue.IsFull()), - "DemoThreadData::shareQueue.IsFull() did not equal true as expected.", state); + QueuePushFullEquivalent(t, state); for (unsigned int i = 0; i < THREAD_NUM; i++) { threads[i] = std::thread(GetHandleThreadDataTime, std::ref(demoDatas[i]), i, timeT); @@ -430,12 +442,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndBlockInnotfu demoDatas.fill(DemoThreadData()); auto timeT = GetTimeOfSleepTwentyMillisecond(); const unsigned int REMAIN_SLOTS = 5; - AssertTrue((DemoThreadData::shareQueue.IsEmpty()), - "DemoThreadData::shareQueue.IsEmpty() did not equal true as expected.", state); - for (unsigned int i = 0; i < QUEUE_SLOTS - REMAIN_SLOTS; i++) { - int t = i; - DemoThreadData::shareQueue.Push(t); - } + AssertTrue((DemoThreadData::shareQueue.IsEmpty()), "shareQueue.IsEmpty() did not equal true.", state); + QueuePushInnotfullNotEquivalent(REMAIN_SLOTS); for (unsigned int i = 0; i < THREAD_NUM; i++) { threads[i] = std::thread(GetHandleThreadDataTime, std::ref(demoDatas[i]), i, timeT); @@ -481,12 +489,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentPutAndBlockInnotfu demoDatas.fill(DemoThreadData()); auto timeT = GetTimeOfSleepTwentyMillisecond(); const unsigned int REMAIN_SLOTS = 5; - AssertTrue((DemoThreadData::shareQueue.IsEmpty()), - "DemoThreadData::shareQueue.IsEmpty() did not equal true as expected.", state); - for (unsigned int i = 0; i < QUEUE_SLOTS - REMAIN_SLOTS; i++) { - int t = i; - DemoThreadData::shareQueue.Push(t); - } + AssertTrue((DemoThreadData::shareQueue.IsEmpty()), "shareQueue.IsEmpty() did not equal true.", state); + QueuePushInnotfullNotEquivalent(REMAIN_SLOTS); for (unsigned int i = 0; i < THREAD_NUM; i++) { threads[i] = std::thread(PutHandleThreadDataTime, std::ref(demoDatas[i]), i, timeT); @@ -582,11 +586,7 @@ BENCHMARK_F(BenchmarkSafeBlockQueue, testMutilthreadConcurrentGetAndPopInfullque AssertTrue((DemoThreadData::shareQueue.IsEmpty()), "DemoThreadData::shareQueue.IsEmpty() did not equal true as expected.", state); int t = 1; - for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { - DemoThreadData::shareQueue.Push(t); - } - AssertTrue((DemoThreadData::shareQueue.IsFull()), - "DemoThreadData::shareQueue.IsFull() did not equal true as expected.", state); + QueuePushFullEquivalent(t, state); for (unsigned int i = 0; i < THREAD_NUM; i++) { threadsin[i] = std::thread(PutHandleThreadDataTime, std::ref(demoDatas[i]), i, timeT); 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 a89f26d..218f5ad 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 @@ -103,30 +103,30 @@ void PutHandleThreadData(DemoThreadData& q, int i) q.Put(i); } -void GetThreadDatePushedStatus(std::array& demoDatas, unsigned int& pushedIn, - unsigned int& unpushedIn) +void GetThreadDateGetedStatus(std::array& demoDatas, unsigned int& getedOut, + unsigned int& ungetedOut) { - pushedIn = 0; - unpushedIn = 0; + getedOut = 0; + ungetedOut = 0; for (auto& t : demoDatas) { - if (t.putStatus) { - pushedIn++; + if (t.getStatus) { + getedOut += 1; } else { - unpushedIn++; + ungetedOut += 1; } } } -void GetThreadDateGetedStatus(std::array& demoDatas, unsigned int& getedOut, - unsigned int& ungetedOut) +void GetThreadDatePushedStatus(std::array& demoDatas, unsigned int& pushedIn, + unsigned int& unpushedIn) { - getedOut = 0; - ungetedOut = 0; + pushedIn = 0; + unpushedIn = 0; for (auto& t : demoDatas) { - if (t.getStatus) { - getedOut++; + if (t.putStatus) { + pushedIn += 1; } else { - ungetedOut++; + unpushedIn += 1; } } } diff --git a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp index e035c1f..88ee0f9 100644 --- a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp @@ -517,8 +517,8 @@ BENCHMARK_F(BenchmarkSafeMap, testUtilsConcurrentWriteAndFind001)(benchmark::Sta std::thread threads[THREAD_NUM]; std::vector> vcfi; while (state.KeepRunning()) { - auto lamfuncInsert = [](SafeMap& data, const string& key, - const int& value, std::chrono::time_point absTime) { + auto lamfuncInsert = [](SafeMap& data, const string& key, const int& value, + std::chrono::time_point absTime) { std::this_thread::sleep_until(absTime); data.EnsureInsert(key, value); }; @@ -535,8 +535,7 @@ BENCHMARK_F(BenchmarkSafeMap, testUtilsConcurrentWriteAndFind001)(benchmark::Sta timeT += std::chrono::milliseconds(SLEEP_FOR_FIFTY_MILLISECOND); string key("A"); for (int i = 0; i < THREAD_NUM; ++i) { - threads[i] = std::thread(lamfuncInsert, std::ref(demoData), - key + std::to_string(i), i, timeT); + threads[i] = std::thread(lamfuncInsert, std::ref(demoData), key + std::to_string(i), i, timeT); vcfi.push_back(std::async(std::launch::async, lamfuncCheckLoop, std::ref(demoData), key + std::to_string(i), timeT)); } diff --git a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp index e82aec9..564b8f0 100644 --- a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp +++ b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp @@ -30,22 +30,23 @@ static constexpr long DELAYEDSINGLETON_SP2_USE_COUNT = 3; class BenchmarkSingletonTest : public benchmark::Fixture { public: - BenchmarkSingletonTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkSingletonTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkSingletonTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkSingletonTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp index 9acb6d1..c8b981f 100644 --- a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp +++ b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp @@ -35,22 +35,23 @@ const size_t EXPECTED_SIZE_AFTER_DUPLICATES = 30; class BenchmarkSortedVector : public benchmark::Fixture { public: - BenchmarkSortedVector() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkSortedVector() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkSortedVector() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkSortedVector() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp index 7038951..91df518 100644 --- a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp +++ b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp @@ -39,22 +39,23 @@ static constexpr int GETSUBSTR04_STRING_SIZE = 0; class BenchmarkStringTest : public benchmark::Fixture { public: - BenchmarkStringTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkStringTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkStringTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkStringTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 1000; diff --git a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp index 68a9a3f..4a55425 100644 --- a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp +++ b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp @@ -29,22 +29,23 @@ namespace { class BenchmarkThreadTest : public benchmark::Fixture { public: - BenchmarkThreadTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkThreadTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkThreadTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkThreadTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 100; diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp index 49ae526..fcbba87 100644 --- a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp +++ b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp @@ -34,22 +34,23 @@ static bool g_flagTestFuncGetName = true; class BenchmarkThreadPoolTest : public benchmark::Fixture { public: - BenchmarkThreadPoolTest() + void SetUp(const ::benchmark::State& state) override { - Iterations(iterations); - Repetitions(repetitions); - ReportAggregatesOnly(); } - ~BenchmarkThreadPoolTest() override = default; - void SetUp(const ::benchmark::State& state) override + void TearDown(const ::benchmark::State& state) override { } - void TearDown(const ::benchmark::State& state) override + BenchmarkThreadPoolTest() { + Iterations(iterations); + Repetitions(repetitions); + ReportAggregatesOnly(); } + ~BenchmarkThreadPoolTest() override = default; + protected: const int32_t repetitions = 3; const int32_t iterations = 100; -- Gitee