[github36] benchmark methods renamed

 - they now follow coding guidelines and are more descriptive

diff --git a/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc b/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc
index a3c93c61a68782d1c380c3f5f48774c9012e8ec7..6973a86e26c85575a7c87f475ec389fc3bcd3b08 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc
@@ -84,83 +84,83 @@ BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, updateHosts)(benchmark::State& st
 }
 
 // This benchmark 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAll2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAllByHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll2();
+        benchGetAllByHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAll3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAll)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll3();
+        benchGetAll();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAll1)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, getAllv4Resv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll1();
+        getAllv4Resv();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_3();
+        benchGet4BySubnetHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_4();
+        benchGet4IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4_2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_2();
+        benchGet4SubnetIdv4Resrv();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_3();
+        benchGet6SubnetIdDuidHWAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_4();
+        benchGet6IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6_2_subnetid_address)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6SubnetIdAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_subnetid_address();
+        benchGet6SubnetIdAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_prefix_prefixlen();
+        benchGet6Prefix();
     }
 }
 
@@ -170,15 +170,15 @@ constexpr benchmark::TimeUnit UNIT = benchmark::kMicrosecond;
 
 BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, insertHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, updateHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAll2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAll3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAll1)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4_2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6_2_subnetid_address)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAllByHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAll)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAllv4Resv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6SubnetIdAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6Prefix)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 
 }  // namespace

diff --git a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
index 31d3fede58e577689c5045fd587188b256982287..83d26762306e7265a02759cb49788835ee6ba0fd 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
@@ -167,7 +167,7 @@ GenericHostDataSourceBenchmark::addTestOptions(const HostPtr& host, const bool f
 void
 GenericHostDataSourceBenchmark::prepareHosts(size_t const& host_count) {
     if (host_count > 0xfffdu) {
-        cerr << "host_count <= 0xfffd or change address generation in "
+        cerr << "host_count <= 0xfffd or change address xgeneration in "
                 "GenericLeaseMgrBenchmark::prepareLeases6()"
              << endl;
     }
@@ -200,7 +200,7 @@ GenericHostDataSourceBenchmark::updateHosts() {
 }
 
 void
-GenericHostDataSourceBenchmark::getAll2() {
+GenericHostDataSourceBenchmark::benchGetAllByHWAddrDuid() {
     for (HostPtr host : hosts_) {
         ConstHostCollection from_hds =
             hdsptr_->getAll(host->getHWAddress(), host->getDuid());
@@ -208,7 +208,7 @@ GenericHostDataSourceBenchmark::getAll2() {
 }
 
 void
-GenericHostDataSourceBenchmark::getAll3() {
+GenericHostDataSourceBenchmark::benchGetAll() {
     for (HostPtr host : hosts_) {
         std::vector<uint8_t> hwaddr = host->getIdentifier();
         hdsptr_->getAll(host->getIdentifierType(), &hwaddr[0], hwaddr.size());
@@ -216,14 +216,14 @@ GenericHostDataSourceBenchmark::getAll3() {
 }
 
 void
-GenericHostDataSourceBenchmark::getAll1() {
+GenericHostDataSourceBenchmark::getAllv4Resv() {
     for (HostPtr host : hosts_) {
         hdsptr_->getAll4(host->getIPv4Reservation());
     }
 }
 
 void
-GenericHostDataSourceBenchmark::get4_3() {
+GenericHostDataSourceBenchmark::benchGet4BySubnetHWAddrDuid() {
     for (HostPtr host : hosts_) {
         std::vector<uint8_t> hwaddr = host->getIdentifier();
         hdsptr_->get4(host->getIPv4SubnetID(),
@@ -233,7 +233,7 @@ GenericHostDataSourceBenchmark::get4_3() {
 }
 
 void
-GenericHostDataSourceBenchmark::get4_4() {
+GenericHostDataSourceBenchmark::benchGet4IdentifierSubnetId() {
     for (HostPtr host : hosts_) {
         std::vector<uint8_t> hwaddr = host->getIdentifier();
         hdsptr_->get4(host->getIPv4SubnetID(), host->getIdentifierType(),
@@ -242,14 +242,14 @@ GenericHostDataSourceBenchmark::get4_4() {
 }
 
 void
-GenericHostDataSourceBenchmark::get4_2() {
+GenericHostDataSourceBenchmark::benchGet4SubnetIdv4Resrv() {
     for (HostPtr host : hosts_) {
         hdsptr_->get4(host->getIPv4SubnetID(), host->getIPv4Reservation());
     }
 }
 
 void
-GenericHostDataSourceBenchmark::get6_3() {
+GenericHostDataSourceBenchmark::benchGet6SubnetIdDuidHWAddr() {
     for (HostPtr host : hosts_) {
         hdsptr_->get6(host->getIPv6SubnetID(), host->getDuid(),
                       host->getHWAddress());
@@ -257,7 +257,7 @@ GenericHostDataSourceBenchmark::get6_3() {
 }
 
 void
-GenericHostDataSourceBenchmark::get6_4() {
+GenericHostDataSourceBenchmark::benchGet6IdentifierSubnetId() {
     for (HostPtr host : hosts_) {
         std::vector<uint8_t> hwaddr = host->getIdentifier();
         hdsptr_->get6(host->getIPv6SubnetID(), host->getIdentifierType(),
@@ -266,7 +266,7 @@ GenericHostDataSourceBenchmark::get6_4() {
 }
 
 void
-GenericHostDataSourceBenchmark::get6_2_subnetid_address() {
+GenericHostDataSourceBenchmark::benchGet6SubnetIdAddr() {
     for (HostPtr host : hosts_) {
         const IPv6ResrvRange range = host->getIPv6Reservations();
         hdsptr_->get6(host->getIPv6SubnetID(), range.first->second.getPrefix());
@@ -274,7 +274,7 @@ GenericHostDataSourceBenchmark::get6_2_subnetid_address() {
 }
 
 void
-GenericHostDataSourceBenchmark::get6_2_prefix_prefixlen() {
+GenericHostDataSourceBenchmark::benchGet6Prefix() {
     for (HostPtr host : hosts_) {
         const IPv6ResrvRange range = host->getIPv6Reservations();
         hdsptr_->get6(range.first->second.getPrefix(),

diff --git a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h
index c38f0b8d1f9d8abeb36fed83ae3d9a793894d692..e4e98f27acfd18c7422718164ad847229dc03722 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h
+++ b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h
@@ -159,24 +159,57 @@ public:
     void addTestOptions(const HostPtr& host,const bool formatted,
                         const AddedOptions& added_options) const;
 
+    /// @brief Sets up timers, creates and inserts hosts.
+    ///
+    /// @param state reference to the state of the benchmark
+    /// @param host_count number of hosts to be created
     void setUp(::benchmark::State& state, size_t const& host_count);
-    void setUpWithInserts(::benchmark::State& state,
-                                   size_t const& host_count);
+
+    /// @brief Sets up the benchmark with specified number of hosts
+    ///
+    /// @param state reference to the state of the benchmark
+    /// @param host_count number of hosts to be created
+    void setUpWithInserts(::benchmark::State& state, size_t const& host_count);
+
+    /// @brief Creates specified number of hosts and stores them in hosts_
+    ///
+    /// @param host_count number of hosts to be created
     void prepareHosts(size_t const& lease_count);
+
+    /// @brief Inserts all hosts stored in hosts_ into the benchmarked host backend
     void insertHosts();
+
+    /// @brief Updates all hosts stored in hosts_ in the benchmarked host backend
     void updateHosts();
-    void getAll2();
-    void getAll3();
-    void getAll1();
-    void get4_3();
-    void get4_4();
-    void get4_2();
-    void get6_3();
-    void get6_4();
-    void get6_2_subnetid_address();
-    void get6_2_prefix_prefixlen();
 
+    void benchGetAllByHWAddrDuid();
+
+    /// @brief Essential steps required to benchmark the
+    ///        getAll(identifier-type, identifier) call.
+    void benchGetAll();
+
+    /// @brief Essential stpes requires to benchmark host reservation retrieval
+    ///        using getAll(ipv4-reservation) call.
+    void getAllv4Resv();
+
+    void benchGet4BySubnetHWAddrDuid();
+
+    void benchGet4IdentifierSubnetId();
+
+    void benchGet4SubnetIdv4Resrv();
+
+    void benchGet6SubnetIdDuidHWAddr();
+
+    void benchGet6IdentifierSubnetId();
+
+    void benchGet6SubnetIdAddr();
+
+    void benchGet6Prefix();
+
+    /// Pointer to the host backend being benchmarked
     HostDataSourcePtr hdsptr_;
+
+    /// Store hosts being used during benchmark.
     HostCollection hosts_;
 };
 

diff --git a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
index 941aa6570e786535ac7b2b22971a7567e834262e..19160a2b8256f03a088c01aaa171921a1630f77b 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc
@@ -53,7 +53,8 @@ GenericLeaseMgrBenchmark::setUp4(::benchmark::State& state, size_t const& lease_
 }
 
 void
-GenericLeaseMgrBenchmark::setUpWithInserts4(::benchmark::State& state, size_t const& lease_count) {
+GenericLeaseMgrBenchmark::setUpWithInserts4(::benchmark::State& state,
+                                            size_t const& lease_count) {
     state.PauseTiming();
     SetUp(state);
     prepareLeases4(lease_count);
@@ -70,7 +71,8 @@ GenericLeaseMgrBenchmark::setUp6(::benchmark::State& state, size_t const& lease_
 }
 
 void
-GenericLeaseMgrBenchmark::setUpWithInserts6(::benchmark::State& state, size_t const& lease_count) {
+GenericLeaseMgrBenchmark::setUpWithInserts6(::benchmark::State& state,
+                                            size_t const& lease_count) {
     state.PauseTiming();
     SetUp(state);
     prepareLeases6(lease_count);
@@ -151,13 +153,6 @@ GenericLeaseMgrBenchmark::benchGetExpiredLeases4() {
     lmptr_->getExpiredLeases4(expired_leases, leases4_.size());
 }
 
-/*
- *  Calls that aren't measured:
- *      * deleteLease(const Lease4Ptr& lease);
- *      * deleteLease(const Lease6Ptr& lease);
- *      * deleteExpiredReclaimedLeases4(const uint32_t secs);
- */
-
 void
 GenericLeaseMgrBenchmark::prepareLeases6(size_t const& lease_count) {
     if (lease_count > 0xfffdu) {

diff --git a/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc b/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc
index e65cfc69d0660f5a0cf3ee0f120a3a32fec3fcab..d26704926c64f1794b65ab423927d834319b63f0 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc
@@ -76,83 +76,83 @@ BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, updateHosts)(benchmark::State&
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAll2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAllByHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll2();
+        benchGetAllByHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAll3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAll)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll3();
+        benchGetAll();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAll1)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, getAllv4Resv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll1();
+        getAllv4Resv();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_3();
+        benchGet4BySubnetHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_4();
+        benchGet4IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4_2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_2();
+        benchGet4SubnetIdv4Resrv();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_3();
+        benchGet6SubnetIdDuidHWAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_4();
+        benchGet6IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6_2_subnetid_address)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6SubnetIdAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_subnetid_address();
+        benchGet6SubnetIdAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_prefix_prefixlen();
+        benchGet6Prefix();
     }
 }
 
@@ -162,15 +162,15 @@ constexpr benchmark::TimeUnit UNIT = benchmark::kMicrosecond;
 
 BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, insertHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, updateHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAll2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAll3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAll1)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4_2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6_2_subnetid_address)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAllByHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAll)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAllv4Resv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6SubnetIdAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6Prefix)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 
 }  // namespace

diff --git a/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc b/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc
index 7b7b245f9a62ff20660394f87325e4304b0bafe5..eac80949605a6e876e3dadb38b3e60bf183f7d7b 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc
@@ -76,83 +76,83 @@ BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, updateHosts)(benchmark::State&
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAll2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAllByHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll2();
+        benchGetAllByHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAll3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAll)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll3();
+        benchGetAll();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAll1)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, getAllv4Resv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        getAll1();
+        getAllv4Resv();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_3();
+        benchGet4BySubnetHWAddrDuid();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_4();
+        benchGet4IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4_2)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get4_2();
+        benchGet4SubnetIdv4Resrv();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6_3)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_3();
+        benchGet6SubnetIdDuidHWAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6_4)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6IdentifierSubnetId)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_4();
+        benchGet6IdentifierSubnetId();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6_2_subnetid_address)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6SubnetIdAddr)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_subnetid_address();
+        benchGet6SubnetIdAddr();
     }
 }
 
-BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)(benchmark::State& state) {
+BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& state) {
     const size_t host_count = state.range(0);
     while (state.KeepRunning()) {
         setUpWithInserts(state, host_count);
-        get6_2_prefix_prefixlen();
+        benchGet6Prefix();
     }
 }
 
@@ -162,15 +162,15 @@ constexpr benchmark::TimeUnit UNIT = benchmark::kMicrosecond;
 
 BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, insertHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, updateHosts)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAll2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAll3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAll1)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4_2)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6_3)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6_4)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6_2_subnetid_address)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
-BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6_2_prefix_prefixlen)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAllByHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAll)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAllv4Resv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4BySubnetHWAddrDuid)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4SubnetIdv4Resrv)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6SubnetIdDuidHWAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6IdentifierSubnetId)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6SubnetIdAddr)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
+BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6Prefix)->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT);
 
 }  // namespace