[github36] benchmark methods prepended with bench* prefix.

diff --git a/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc
index 755678d02b1b9658b6487529240beba1c3879849..eb5a71b3d894edbf78731db78c9895ff3dfd36db 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc
@@ -62,7 +62,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, insertLeases4)(benchmark::State& state)
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp4(state, lease_count);
-        insertLeases4();
+        benchInsertLeases4();
     }
 }
 
@@ -70,7 +70,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, updateLeases4)(benchmark::State& state)
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        updateLeases4();
+        benchUpdateLeases4();
     }
 }
 
@@ -78,7 +78,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease4_address)(benchmark::State& st
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_address();
+        benchGetLease4_address();
     }
 }
 
@@ -86,7 +86,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease4_hwaddr)(benchmark::State& sta
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr();
+        benchGetLease4_hwaddr();
     }
 }
 
@@ -94,7 +94,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid)(benchmark::S
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr_subnetid();
+        benchGetLease4_hwaddr_subnetid();
     }
 }
 
@@ -102,7 +102,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease4_clientid)(benchmark::State& s
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid();
+        benchGetLease4_clientid();
     }
 }
 
@@ -110,7 +110,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease4_clientid_subnetid)(benchmark:
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid_subnetid();
+        benchGetLease4_clientid_subnetid();
     }
 }
 
@@ -118,7 +118,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getExpiredLeases4)(benchmark::State& st
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getExpiredLeases4();
+        benchGetExpiredLeases4();
     }
 }
 
@@ -126,7 +126,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, insertLeases6)(benchmark::State& state)
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp6(state, lease_count);
-        insertLeases6();
+        benchInsertLeases6();
     }
 }
 
@@ -134,7 +134,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, updateLeases6)(benchmark::State& state)
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        updateLeases6();
+        benchUpdateLeases6();
     }
 }
 
@@ -142,7 +142,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease6_type_address)(benchmark::Stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_address();
+        benchGetLease6_type_address();
     }
 }
 
@@ -150,7 +150,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark::St
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_duid_iaid();
+        benchGetLease6_type_duid_iaid();
     }
 }
 
@@ -158,7 +158,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease6_type_type_duid_iaid_subnetid)
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_type_duid_iaid_subnetid();
+        benchGetLease6_type_duid_iaid_subnetid();
     }
 }
 
@@ -166,7 +166,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State& st
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getExpiredLeases6();
+        benchGetExpiredLeases6();
     }
 }
 

diff --git a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
index 6e85c57bb28b970b4918e7521c78525803dbea78..3cf7a530c68669f1f6672fc23df132f764eacf58 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
@@ -68,7 +68,7 @@ GenericLeaseMgrBenchmark::ReentrantSetUpWithInserts4(
     state.PauseTiming();
     SetUp(state);
     prepareLeases4(lease_count);
-    insertLeases4();
+    benchInsertLeases4();
     state.ResumeTiming();
 }
 
@@ -87,7 +87,7 @@ GenericLeaseMgrBenchmark::ReentrantSetUpWithInserts6(
     state.PauseTiming();
     SetUp(state);
     prepareLeases6(lease_count);
-    insertLeases6();
+    benchInsertLeases6();
     state.ResumeTiming();
 }
 
@@ -111,56 +111,56 @@ GenericLeaseMgrBenchmark::prepareLeases4(size_t const& lease_count) {
 }
 
 void
-GenericLeaseMgrBenchmark::insertLeases4() {
+GenericLeaseMgrBenchmark::benchInsertLeases4() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->addLease(lease);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::updateLeases4() {
+GenericLeaseMgrBenchmark::benchUpdateLeases4() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->updateLease4(lease);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease4_address() {
+GenericLeaseMgrBenchmark::benchGetLease4_address() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->getLease4(lease->addr_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease4_hwaddr() {
+GenericLeaseMgrBenchmark::benchGetLease4_hwaddr() {
     for (Lease4Ptr const& lease : leases4_) {
         const Lease4Collection collection = lmptr_->getLease4(*lease->hwaddr_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease4_hwaddr_subnetid() {
+GenericLeaseMgrBenchmark::benchGetLease4_hwaddr_subnetid() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->getLease4(*lease->hwaddr_, lease->subnet_id_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease4_clientid() {
+GenericLeaseMgrBenchmark::benchGetLease4_clientid() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->getLease4(*lease->client_id_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease4_clientid_subnetid() {
+GenericLeaseMgrBenchmark::benchGetLease4_clientid_subnetid() {
     for (Lease4Ptr const& lease : leases4_) {
         lmptr_->getLease4(*lease->client_id_, lease->subnet_id_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getExpiredLeases4() {
+GenericLeaseMgrBenchmark::benchGetExpiredLeases4() {
     Lease4Collection expired_leases;
     lmptr_->getExpiredLeases4(expired_leases, leases4_.size());
 }
@@ -206,35 +206,35 @@ GenericLeaseMgrBenchmark::prepareLeases6(size_t const& lease_count) {
 }
 
 void
-GenericLeaseMgrBenchmark::insertLeases6() {
+GenericLeaseMgrBenchmark::benchInsertLeases6() {
     for (Lease6Ptr const& lease : leases6_) {
         lmptr_->addLease(lease);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::updateLeases6() {
+GenericLeaseMgrBenchmark::benchUpdateLeases6() {
     for (Lease6Ptr const& lease : leases6_) {
         lmptr_->updateLease6(lease);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease6_type_address() {
+GenericLeaseMgrBenchmark::benchGetLease6_type_address() {
     for (Lease6Ptr const& lease : leases6_) {
         lmptr_->getLease6(lease->type_, lease->addr_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease6_type_duid_iaid() {
+GenericLeaseMgrBenchmark::benchGetLease6_type_duid_iaid() {
     for (Lease6Ptr const& lease : leases6_) {
         lmptr_->getLeases6(lease->type_, *lease->duid_, lease->iaid_);
     }
 }
 
 void
-GenericLeaseMgrBenchmark::getLease6_type_type_duid_iaid_subnetid() {
+GenericLeaseMgrBenchmark::benchGetLease6_type_duid_iaid_subnetid() {
     for (Lease6Ptr const& lease : leases6_) {
         lmptr_->getLease6(lease->type_, *lease->duid_, lease->iaid_,
                           lease->subnet_id_);
@@ -242,7 +242,7 @@ GenericLeaseMgrBenchmark::getLease6_type_type_duid_iaid_subnetid() {
 }
 
 void
-GenericLeaseMgrBenchmark::getExpiredLeases6() {
+GenericLeaseMgrBenchmark::benchGetExpiredLeases6() {
     Lease6Collection expired_leases;
     lmptr_->getExpiredLeases6(expired_leases, leases6_.size());
 }

diff --git a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h
index 05bd8134d96ef6630ba5dc012f7fb737cb4b18c8..774ee8d15656783a722dcf143fe788a101207cdc 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h
+++ b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h
@@ -40,22 +40,22 @@ public:
                                     size_t const& lease_count);
     void prepareLeases4(size_t const& lease_count);
 
-    void insertLeases4();
-    void updateLeases4();
-    void getLease4_address();
-    void getLease4_hwaddr();
-    void getLease4_hwaddr_subnetid();
-    void getLease4_clientid();
-    void getLease4_clientid_subnetid();
-    void getExpiredLeases4();
+    void benchInsertLeases4();
+    void benchUpdateLeases4();
+    void benchGetLease4_address();
+    void benchGetLease4_hwaddr();
+    void benchGetLease4_hwaddr_subnetid();
+    void benchGetLease4_clientid();
+    void benchGetLease4_clientid_subnetid();
+    void benchGetExpiredLeases4();
 
     void prepareLeases6(size_t const& lease_count);
-    void insertLeases6();
-    void updateLeases6();
-    void getLease6_type_address();
-    void getLease6_type_duid_iaid();
-    void getLease6_type_type_duid_iaid_subnetid();
-    void getExpiredLeases6();
+    void benchInsertLeases6();
+    void benchUpdateLeases6();
+    void benchGetLease6_type_address();
+    void benchGetLease6_type_duid_iaid();
+    void benchGetLease6_type_duid_iaid_subnetid();
+    void benchGetExpiredLeases6();
 
     LeaseMgr* lmptr_;
     Lease4Collection leases4_;

diff --git a/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc
index bd02bdae547ce9dc50907b960883c4b7b1ba8889..d81a0426594b89a08ffa01e45c21a269e9ff17ba 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc
@@ -62,7 +62,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, insertLeases4)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp4(state, lease_count);
-        insertLeases4();
+        benchInsertLeases4();
     }
 }
 
@@ -70,7 +70,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, updateLeases4)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        updateLeases4();
+        benchUpdateLeases4();
     }
 }
 
@@ -78,7 +78,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease4_address)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_address();
+        benchGetLease4_address();
     }
 }
 
@@ -86,7 +86,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease4_hwaddr)(benchmark::State& s
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr();
+        benchGetLease4_hwaddr();
     }
 }
 
@@ -94,7 +94,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid)(benchmark:
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr_subnetid();
+        benchGetLease4_hwaddr_subnetid();
     }
 }
 
@@ -102,7 +102,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease4_clientid)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid();
+        benchGetLease4_clientid();
     }
 }
 
@@ -110,7 +110,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease4_clientid_subnetid)(benchmar
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid_subnetid();
+        benchGetLease4_clientid_subnetid();
     }
 }
 
@@ -118,7 +118,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getExpiredLeases4)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getExpiredLeases4();
+        benchGetExpiredLeases4();
     }
 }
 
@@ -126,7 +126,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, insertLeases6)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp6(state, lease_count);
-        insertLeases6();
+        benchInsertLeases6();
     }
 }
 
@@ -134,7 +134,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, updateLeases6)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        updateLeases6();
+        benchUpdateLeases6();
     }
 }
 
@@ -142,7 +142,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_address)(benchmark::St
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_address();
+        benchGetLease6_type_address();
     }
 }
 
@@ -150,15 +150,16 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark::
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_duid_iaid();
+        benchGetLease6_type_duid_iaid();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_type_duid_iaid_subnetid)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_type_duid_iaid_subnetid)
+    (benchmark::State& state) {
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_type_duid_iaid_subnetid();
+        benchGetLease6_type_duid_iaid_subnetid();
     }
 }
 
@@ -166,7 +167,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getExpiredLeases6();
+        benchGetExpiredLeases6();
     }
 }
 

diff --git a/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc
index 542a87f3106cee7d2522329c40bfae3bc2b6c225..315e1ad8df4d17913f4746a42ed16cd7b2b5a947 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc
@@ -62,7 +62,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, insertLeases4)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp4(state, lease_count);
-        insertLeases4();
+        benchInsertLeases4();
     }
 }
 
@@ -70,7 +70,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, updateLeases4)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        updateLeases4();
+        benchUpdateLeases4();
     }
 }
 
@@ -78,7 +78,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease4_address)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_address();
+        benchGetLease4_address();
     }
 }
 
@@ -86,7 +86,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease4_hwaddr)(benchmark::State& s
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr();
+        benchGetLease4_hwaddr();
     }
 }
 
@@ -94,7 +94,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid)(benchmark:
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_hwaddr_subnetid();
+        benchGetLease4_hwaddr_subnetid();
     }
 }
 
@@ -102,7 +102,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease4_clientid)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid();
+        benchGetLease4_clientid();
     }
 }
 
@@ -110,7 +110,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease4_clientid_subnetid)(benchmar
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getLease4_clientid_subnetid();
+        benchGetLease4_clientid_subnetid();
     }
 }
 
@@ -118,7 +118,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getExpiredLeases4)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts4(state, lease_count);
-        getExpiredLeases4();
+        benchGetExpiredLeases4();
     }
 }
 
@@ -126,7 +126,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, insertLeases6)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUp6(state, lease_count);
-        insertLeases6();
+        benchInsertLeases6();
     }
 }
 
@@ -134,7 +134,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, updateLeases6)(benchmark::State& stat
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        updateLeases6();
+        benchUpdateLeases6();
     }
 }
 
@@ -142,7 +142,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease6_type_address)(benchmark::St
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_address();
+        benchGetLease6_type_address();
     }
 }
 
@@ -150,7 +150,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark::
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_duid_iaid();
+        benchGetLease6_type_duid_iaid();
     }
 }
 
@@ -158,7 +158,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease6_type_type_duid_iaid_subneti
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getLease6_type_type_duid_iaid_subnetid();
+        benchGetLease6_type_duid_iaid_subnetid();
     }
 }
 
@@ -166,7 +166,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State&
     const size_t lease_count = state.range(0);
     while (state.KeepRunning()) {
         ReentrantSetUpWithInserts6(state, lease_count);
-        getExpiredLeases6();
+        benchGetExpiredLeases6();
     }
 }
 

diff --git a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
index 086e6ae655f2f3bd93ff9aa80dd4fd02b5930110..81338b47f04f00b985a821bbf1f9a23f261b7d94 100644 (file)
--- a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
@@ -595,8 +595,8 @@ public:
     /// performance results.
     ///
     /// @param n_of_hosts number of hosts to insert into and retrieve from the
-    ///     database; defaults to the maximum number of allowed hosts.
-    void stressTest(uint32_t n_of_hosts /* = 0xfffdU */);
+    ///     database
+    void stressTest(uint32_t n_of_hosts);
     /// @brief Tests that delete(subnet-id, addr4) call works.
     ///
     /// Uses gtest macros to report failures.