From: Razvan Becheriu Date: Mon, 11 Mar 2019 16:22:27 +0000 (+0200) Subject: changes after review X-Git-Tag: Kea-1.6.0-beta~224 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92da36b7652dce75e2f97cee041028f94fe0c73;p=thirdparty%2Fkea.git changes after review --- 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 5cdbc0d1f8..fdaa7c0371 100644 --- a/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/cql_host_data_source_benchmark.cc @@ -34,7 +34,8 @@ using namespace std; namespace { /// @brief This is a fixture class used for benchmarking Cassandra host backend -struct CqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +class CqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates HostMgr @@ -169,55 +170,46 @@ BENCHMARK_DEFINE_F(CqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& sta /// Defines parameters necessary for running a benchmark that measures /// hosts insertion. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, insertHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts update. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, updateHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll4(hw-addr, duid) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAll) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll(v4-reservation) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, getAllv4Resv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(identifier-type, identifier, subnet-id) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(subnet-id, v4-reservation) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get4SubnetIdv4Resrv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, identifier-type, identifier) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, ip-address) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6SubnetIdAddr) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(ip-prefix, prefix-len) call. BENCHMARK_REGISTER_F(CqlHostDataSourceBenchmark, get6Prefix) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); } // namespace diff --git a/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc index 934605f833..06160558f8 100644 --- a/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/cql_lease_mgr_benchmark.cc @@ -24,14 +24,15 @@ #include using namespace isc::db::test; -using namespace isc::dhcp::bench; using namespace isc::dhcp; +using namespace isc::dhcp::bench; using namespace std; namespace { /// @brief This is a fixture class used for benchmarking Cassandra lease backend -struct CqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +class CqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates LeaseMgr @@ -188,7 +189,7 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark::St // Defines a benchmark that measures IPv6 leases retrieval by lease type, duid, iaid // and subnet-id. BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) -(benchmark::State& state) { + (benchmark::State& state) { const size_t lease_count = state.range(0); while (state.KeepRunning()) { setUpWithInserts6(state, lease_count); @@ -210,74 +211,60 @@ BENCHMARK_DEFINE_F(CqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State& st /// A benchmark that measures IPv4 leases insertion. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, insertLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 leases update. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, updateLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by IP address. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease4_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease4_hwaddr) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address and a /// subnet-id. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease4_clientid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id and subnet-id. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease4_clientid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv4 leases retrieval. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getExpiredLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases insertion. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, insertLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases update. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, updateLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type and IP address. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease6_type_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid and iaid. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease6_type_duid_iaid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid, iaid and /// subnet-id. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv6 leases retrieval. BENCHMARK_REGISTER_F(CqlLeaseMgrBenchmark, getExpiredLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_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 00e9e0af41..f85293a79e 100644 --- a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc @@ -17,10 +17,10 @@ #include -#include +#include +#include #include - #include #include #include @@ -28,8 +28,6 @@ #include #include #include - -#include #include #include @@ -105,56 +103,55 @@ GenericHostDataSourceBenchmark::addTestOptions(const HostPtr& host, if ((added_options == DHCP4_ONLY) || (added_options == DHCP4_AND_DHCP6)) { // Add DHCPv4 options. CfgOptionPtr opts = host->getCfgOption4(); - opts->add(createOption(Option::V4, DHO_BOOT_FILE_NAME, true, formatted, - "my-boot-file"), + opts->add(createOption(Option::V4, DHO_BOOT_FILE_NAME, + true, formatted, "my-boot-file"), DHCP4_OPTION_SPACE); - opts->add(createOption(Option::V4, DHO_DEFAULT_IP_TTL, false, formatted, 64), + opts->add(createOption(Option::V4, DHO_DEFAULT_IP_TTL, + false, formatted, 64), DHCP4_OPTION_SPACE); opts->add(createOption(Option::V4, 1, false, formatted, 312131), "vendor-encapsulated-options"); opts->add(createAddressOption(254, false, formatted, "192.0.2.3"), DHCP4_OPTION_SPACE); opts->add(createEmptyOption(Option::V4, 1, true), "isc"); - opts->add(createAddressOption(2, false, formatted, "10.0.0.5", "10.0.0.3", - "10.0.3.4"), - "isc"); + opts->add(createAddressOption(2, false, formatted, + "10.0.0.5", "10.0.0.3", + "10.0.3.4"), "isc"); // Add definitions for DHCPv4 non-standard options. - defs.addItem( - OptionDefinitionPtr(new OptionDefinition("vendor-encapsulated-1", 1, "uint32")), - "vendor-encapsulated-options"); - defs.addItem( - OptionDefinitionPtr(new OptionDefinition("option-254", 254, "ipv4-address", true)), - DHCP4_OPTION_SPACE); + defs.addItem(OptionDefinitionPtr(new OptionDefinition("vendor-encapsulated-1", + 1, "uint32")), "vendor-encapsulated-options"); + defs.addItem(OptionDefinitionPtr(new OptionDefinition("option-254", 254, + "ipv4-address", true)), DHCP4_OPTION_SPACE); defs.addItem(OptionDefinitionPtr(new OptionDefinition("isc-1", 1, "empty")), "isc"); - defs.addItem(OptionDefinitionPtr(new OptionDefinition("isc-2", 2, "ipv4-address", true)), - "isc"); + defs.addItem(OptionDefinitionPtr(new OptionDefinition("isc-2", 2, + "ipv4-address", true)), "isc"); } if ((added_options == DHCP6_ONLY) || (added_options == DHCP4_AND_DHCP6)) { // Add DHCPv6 options. CfgOptionPtr opts = host->getCfgOption6(); - opts->add(createOption(Option::V6, D6O_BOOTFILE_URL, true, formatted, - "my-boot-file"), + opts->add(createOption(Option::V6, D6O_BOOTFILE_URL, + true, formatted, "my-boot-file"), + DHCP6_OPTION_SPACE); + opts->add(createOption(Option::V6, D6O_INFORMATION_REFRESH_TIME, + false, formatted, 3600), DHCP6_OPTION_SPACE); - opts->add(createOption(Option::V6, D6O_INFORMATION_REFRESH_TIME, false, - formatted, 3600), + opts->add(createVendorOption(Option::V6, false, formatted, 2495), DHCP6_OPTION_SPACE); - opts->add(createVendorOption(Option::V6, false, formatted, 2495), DHCP6_OPTION_SPACE); opts->add(createAddressOption(1024, false, formatted, "2001:db8:1::1"), DHCP6_OPTION_SPACE); opts->add(createEmptyOption(Option::V6, 1, true), "isc2"); - opts->add(createAddressOption(2, false, formatted, "3000::1", "3000::2", - "3000::3"), - "isc2"); + opts->add(createAddressOption(2, false, formatted, + "3000::1", "3000::2", + "3000::3"), "isc2"); // Add definitions for DHCPv6 non-standard options. - defs.addItem( - OptionDefinitionPtr(new OptionDefinition("option-1024", 1024, "ipv6-address", true)), - DHCP6_OPTION_SPACE); + defs.addItem(OptionDefinitionPtr(new OptionDefinition("option-1024", 1024, + "ipv6-address", true)), DHCP6_OPTION_SPACE); defs.addItem(OptionDefinitionPtr(new OptionDefinition("option-1", 1, "empty")), "isc2"); - defs.addItem(OptionDefinitionPtr(new OptionDefinition("option-2", 2, "ipv6-address", true)), - "isc2"); + defs.addItem(OptionDefinitionPtr(new OptionDefinition("option-2", 2, + "ipv6-address", true)), "isc2"); } // Register created "runtime" option definitions. They will be used by a @@ -217,8 +214,8 @@ void GenericHostDataSourceBenchmark::benchGet4IdentifierSubnetId() { for (HostPtr host : hosts_) { std::vector hwaddr = host->getIdentifier(); - hdsptr_->get4(host->getIPv4SubnetID(), host->getIdentifierType(), &hwaddr[0], - hwaddr.size()); + hdsptr_->get4(host->getIPv4SubnetID(), host->getIdentifierType(), + &hwaddr[0], hwaddr.size()); } } @@ -233,8 +230,8 @@ void GenericHostDataSourceBenchmark::benchGet6IdentifierSubnetId() { for (HostPtr host : hosts_) { std::vector hwaddr = host->getIdentifier(); - hdsptr_->get6(host->getIPv6SubnetID(), host->getIdentifierType(), &hwaddr[0], - hwaddr.size()); + hdsptr_->get6(host->getIPv6SubnetID(), host->getIdentifierType(), + &hwaddr[0], hwaddr.size()); } } @@ -250,7 +247,8 @@ void GenericHostDataSourceBenchmark::benchGet6Prefix() { for (HostPtr host : hosts_) { const IPv6ResrvRange range = host->getIPv6Reservations(); - hdsptr_->get6(range.first->second.getPrefix(), range.first->second.getPrefixLen()); + hdsptr_->get6(range.first->second.getPrefix(), + range.first->second.getPrefixLen()); } } 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 d445e55a27..8878ba3d22 100644 --- a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h +++ b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.h @@ -28,14 +28,15 @@ namespace dhcp { namespace bench { /// @brief Base fixture class for benchmarking host backends. -struct GenericHostDataSourceBenchmark : public ::benchmark::Fixture { +class GenericHostDataSourceBenchmark : public ::benchmark::Fixture { +public: /// @brief Defines universe (IPv4 or IPv6) enum Universe { V4, V6 }; /// @brief Defines what kind of options should be added for a host enum AddedOptions { - DHCP4_ONLY, ///< DHCPv4-only options - DHCP6_ONLY, ///< DHCPv6-only options + DHCP4_ONLY, ///< DHCPv4-only options + DHCP6_ONLY, ///< DHCPv6-only options DHCP4_AND_DHCP6 ///< Both DHCPv4 and DHCPv6 options }; diff --git a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc index 7cb0bf0b3a..ea36effc4a 100644 --- a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.cc @@ -213,7 +213,8 @@ GenericLeaseMgrBenchmark::benchGetLease6_type_duid_iaid() { void GenericLeaseMgrBenchmark::benchGetLease6_type_duid_iaid_subnetid() { for (Lease6Ptr const& lease : leases6_) { - lmptr_->getLease6(lease->type_, *lease->duid_, lease->iaid_, lease->subnet_id_); + lmptr_->getLease6(lease->type_, *lease->duid_, lease->iaid_, + lease->subnet_id_); } } diff --git a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h index d636e28cca..d904a41fd2 100644 --- a/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h +++ b/src/lib/dhcpsrv/benchmarks/generic_lease_mgr_benchmark.h @@ -27,7 +27,8 @@ namespace dhcp { namespace bench { /// @brief A base class for a fixture for specific lease manager benchmarks -struct GenericLeaseMgrBenchmark : public benchmark::Fixture { +class GenericLeaseMgrBenchmark : public benchmark::Fixture { +public: /// Specifies the IP protocol family to be bested. enum Universe { V4, V6 }; diff --git a/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc index 2afe5f4205..52e080d08e 100644 --- a/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc @@ -12,15 +12,16 @@ #include #include -using namespace isc::dhcp::bench; -using namespace isc::dhcp::test; +using namespace isc::db::test; using namespace isc::dhcp; +using namespace isc::dhcp::bench; using namespace std; namespace { /// @brief This is a fixture class used for benchmarking Memfile lease backend -struct MemfileLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +class MemfileLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +public: /// @brief Constructor /// /// Sets the files used for writing lease files. @@ -45,7 +46,7 @@ struct MemfileLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { LeaseMgrFactory::destroy(); startBackend(V4); } catch (...) { - std::cerr << "ERROR: unable to start memfile backend." << std::endl; + std::cerr << "ERROR: unable to start memfile backend.\n"; throw; } lmptr_ = &(LeaseMgrFactory::instance()); @@ -63,8 +64,8 @@ struct MemfileLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { try { LeaseMgrFactory::create(getConfigString(u)); } catch (...) { - std::cerr << "*** ERROR: unable to create instance of the Memfile\n" - " lease database backend.\n"; + std::cerr << "*** ERROR: unable to create instance of the Memfile " + << "lease database backend.\n"; throw; } lmptr_ = &(LeaseMgrFactory::instance()); @@ -127,8 +128,7 @@ struct MemfileLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { lmptr_->rollback(); } catch (...) { std::cerr << "WARNING: rollback has failed. This is surprising as " - "memfile doesn't support rollback." - << std::endl; + << "memfile doesn't support rollback.\n"; } LeaseMgrFactory::destroy(); @@ -263,7 +263,7 @@ BENCHMARK_DEFINE_F(MemfileLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark // Defines a benchmark that measures IPv6 leases retrieval by lease type, duid, iaid // and subnet-id. BENCHMARK_DEFINE_F(MemfileLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) -(benchmark::State& state) { + (benchmark::State& state) { const size_t lease_count = state.range(0); while (state.KeepRunning()) { setUpWithInserts6(state, lease_count); @@ -285,74 +285,60 @@ BENCHMARK_DEFINE_F(MemfileLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State /// A benchmark that measures IPv4 leases insertion. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, insertLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 leases update. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, updateLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by IP address. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease4_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease4_hwaddr) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address and a /// subnet-id. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease4_hwaddr_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease4_clientid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id and subnet-id. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease4_clientid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv4 leases retrieval. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getExpiredLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases insertion. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, insertLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases update. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, updateLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type and IP address. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease6_type_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid and iaid. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease6_type_duid_iaid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid, iaid and /// subnet-id. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv6 leases retrieval. BENCHMARK_REGISTER_F(MemfileLeaseMgrBenchmark, getExpiredLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); } // namespace 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 97c7652dab..76fa8b5a36 100644 --- a/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/mysql_host_data_source_benchmark.cc @@ -34,7 +34,8 @@ using namespace std; namespace { /// @brief This is a fixture class used for benchmarking MySQL host backend -struct MySqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +class MySqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates HostMgr @@ -169,55 +170,46 @@ BENCHMARK_DEFINE_F(MySqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& s /// Defines parameters necessary for running a benchmark that measures /// hosts insertion. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, insertHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts update. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, updateHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll4(hw-addr, duid) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAll) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll(v4-reservation) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, getAllv4Resv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(identifier-type, identifier, subnet-id) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(subnet-id, v4-reservation) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get4SubnetIdv4Resrv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, identifier-type, identifier) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, ip-address) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6SubnetIdAddr) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(ip-prefix, prefix-len) call. BENCHMARK_REGISTER_F(MySqlHostDataSourceBenchmark, get6Prefix) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); } // namespace diff --git a/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc index 7d59ad4558..84b8649a07 100644 --- a/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/mysql_lease_mgr_benchmark.cc @@ -17,12 +17,12 @@ #include +#include + #include #include #include -#include - using namespace isc::db::test; using namespace isc::dhcp; using namespace isc::dhcp::bench; @@ -31,7 +31,8 @@ using namespace std; namespace { /// @brief This is a fixture class used for benchmarking MySQL lease backend -struct MySqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +class MySqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates LeaseMgr @@ -186,7 +187,7 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark:: // Defines a benchmark that measures IPv6 leases retrieval by lease type, duid, iaid // and subnet-id. BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) -(benchmark::State& state) { + (benchmark::State& state) { const size_t lease_count = state.range(0); while (state.KeepRunning()) { setUpWithInserts6(state, lease_count); @@ -208,74 +209,60 @@ BENCHMARK_DEFINE_F(MySqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State& /// A benchmark that measures IPv4 leases insertion. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, insertLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 leases update. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, updateLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by IP address. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease4_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease4_hwaddr) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address and a /// subnet-id. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease4_clientid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id and subnet-id. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease4_clientid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv4 leases retrieval. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getExpiredLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases insertion. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, insertLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases update. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, updateLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type and IP address. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease6_type_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid and iaid. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease6_type_duid_iaid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid, iaid and /// subnet-id. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv6 leases retrieval. BENCHMARK_REGISTER_F(MySqlLeaseMgrBenchmark, getExpiredLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_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 ef3d6b7f4d..a129a9555f 100644 --- a/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/pgsql_host_data_source_benchmark.cc @@ -17,24 +17,25 @@ #include +#include + #include #include #include #include -#include - #include using namespace isc::db::test; -using namespace isc::dhcp::bench; using namespace isc::dhcp; +using namespace isc::dhcp::bench; using namespace std; namespace { /// @brief This is a fixture class used for benchmarking PostgreSQL host backend -struct PgSqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +class PgSqlHostDataSourceBenchmark : public GenericHostDataSourceBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates HostMgr @@ -169,55 +170,46 @@ BENCHMARK_DEFINE_F(PgSqlHostDataSourceBenchmark, get6Prefix)(benchmark::State& s /// Defines parameters necessary for running a benchmark that measures /// hosts insertion. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, insertHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts update. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, updateHosts) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll4(hw-addr, duid) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAll) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by getAll(v4-reservation) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, getAllv4Resv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(identifier-type, identifier, subnet-id) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get4(subnet-id, v4-reservation) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get4SubnetIdv4Resrv) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, identifier-type, identifier) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6IdentifierSubnetId) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(subnet-id, ip-address) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6SubnetIdAddr) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); /// Defines parameters necessary for running a benchmark that measures /// hosts retrieval by get6(ip-prefix, prefix-len) call. BENCHMARK_REGISTER_F(PgSqlHostDataSourceBenchmark, get6Prefix) - ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT) - ->Unit(UNIT); + ->Range(MIN_HOST_COUNT, MAX_HOST_COUNT)->Unit(UNIT); } // namespace diff --git a/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc index f9d0c89807..363cbf72a5 100644 --- a/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc +++ b/src/lib/dhcpsrv/benchmarks/pgsql_lease_mgr_benchmark.cc @@ -17,12 +17,12 @@ #include +#include + #include #include #include -#include - using namespace isc::db::test; using namespace isc::dhcp; using namespace isc::dhcp::bench; @@ -31,7 +31,8 @@ using namespace std; namespace { /// @brief This is a fixture class used for benchmarking PostgreSQL lease backend -struct PgSqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +class PgSqlLeaseMgrBenchmark : public GenericLeaseMgrBenchmark { +public: /// @brief Setup routine. /// /// It cleans up schema and recreates tables, then instantiates LeaseMgr @@ -186,7 +187,7 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease6_type_duid_iaid)(benchmark:: // Defines a benchmark that measures IPv6 leases retrieval by lease type, duid, iaid // and subnet-id. BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) -(benchmark::State& state) { + (benchmark::State& state) { const size_t lease_count = state.range(0); while (state.KeepRunning()) { setUpWithInserts6(state, lease_count); @@ -208,74 +209,60 @@ BENCHMARK_DEFINE_F(PgSqlLeaseMgrBenchmark, getExpiredLeases6)(benchmark::State& /// A benchmark that measures IPv4 leases insertion. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, insertLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 leases update. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, updateLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by IP address. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease4_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease4_hwaddr) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by hardware address and a /// subnet-id. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease4_hwaddr_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease4_clientid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv4 lease retrieval by client-id and subnet-id. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease4_clientid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv4 leases retrieval. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getExpiredLeases4) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases insertion. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, insertLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 leases update. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, updateLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type and IP address. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease6_type_address) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid and iaid. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease6_type_duid_iaid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures IPv6 lease retrieval by lease type, duid, iaid and /// subnet-id. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getLease6_type_duid_iaid_subnetid) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); /// A benchmark that measures expired IPv6 leases retrieval. BENCHMARK_REGISTER_F(PgSqlLeaseMgrBenchmark, getExpiredLeases6) - ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT) - ->Unit(UNIT); + ->Range(MIN_LEASE_COUNT, MAX_LEASE_COUNT)->Unit(UNIT); } // namespace diff --git a/src/lib/dhcpsrv/benchmarks/run_benchmarks.cc b/src/lib/dhcpsrv/benchmarks/run_benchmarks.cc index 35ac2c33b3..299226b897 100644 --- a/src/lib/dhcpsrv/benchmarks/run_benchmarks.cc +++ b/src/lib/dhcpsrv/benchmarks/run_benchmarks.cc @@ -20,7 +20,8 @@ #include /// @brief A simple class that initializes logging. -struct Initializer { +class Initializer { +public: Initializer() { isc::log::initLogger(); }