BIND 10 trac2040, updated. 5263aaafa559b202f2731da3a152b16bcf55bd74 [2040] Changes after review
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Aug 20 14:24:37 UTC 2012
The branch, trac2040 has been updated
via 5263aaafa559b202f2731da3a152b16bcf55bd74 (commit)
from 2ebd8cf46447c014945cbc5059671ee72c316b30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5263aaafa559b202f2731da3a152b16bcf55bd74
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Mon Aug 20 16:24:26 2012 +0200
[2040] Changes after review
- member variables are now lower-case with trailing underscore
- hit ratio is now member of the base class
- missing dependency in Makefile added
-----------------------------------------------------------------------
Summary of changes:
tests/tools/dhcp-ubench/Makefile | 6 +--
tests/tools/dhcp-ubench/benchmark.cc | 67 +++++++++++++----------------
tests/tools/dhcp-ubench/benchmark.h | 23 ++++++----
tests/tools/dhcp-ubench/memfile_ubench.cc | 49 +++++++++++----------
tests/tools/dhcp-ubench/memfile_ubench.h | 5 +--
tests/tools/dhcp-ubench/mysql_ubench.cc | 31 ++++++-------
tests/tools/dhcp-ubench/sqlite_ubench.cc | 63 +++++++++++++--------------
tests/tools/dhcp-ubench/sqlite_ubench.h | 2 +-
8 files changed, 119 insertions(+), 127 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/tools/dhcp-ubench/Makefile b/tests/tools/dhcp-ubench/Makefile
index df902d2..4944f52 100644
--- a/tests/tools/dhcp-ubench/Makefile
+++ b/tests/tools/dhcp-ubench/Makefile
@@ -14,7 +14,7 @@ all: mysql_ubench sqlite_ubench memfile_ubench
doc: dhcp-perf-guide.html dhcp-perf-guide.pdf
-mysql_ubench.o: mysql_ubench.cc mysql_ubench.h
+mysql_ubench.o: mysql_ubench.cc mysql_ubench.h benchmark.h
$(CXX) $< -c $(CFLAGS) $(MYSQL_CFLAGS)
benchmark.o: benchmark.cc benchmark.h
@@ -23,13 +23,13 @@ benchmark.o: benchmark.cc benchmark.h
mysql_ubench: mysql_ubench.o benchmark.o
$(CXX) $< benchmark.o -o mysql_ubench $(CFLAGS) $(MYSQL_CFLAGS) $(LDFLAGS) $(MYSQL_LDFLAGS)
-sqlite_ubench.o: sqlite_ubench.cc sqlite_ubench.h
+sqlite_ubench.o: sqlite_ubench.cc sqlite_ubench.h benchmark.h
$(CXX) $< -c $(CFLAGS) $(SQLLITE_CFLAGS)
sqlite_ubench: sqlite_ubench.o benchmark.o
$(CXX) $< benchmark.o -o sqlite_ubench $(CFLAGS) $(SQLITE_CFLAGS) $(LDFLAGS) $(SQLITE_LDFLAGS)
-memfile_ubench.o: memfile_ubench.cc memfile_ubench.h
+memfile_ubench.o: memfile_ubench.cc memfile_ubench.h benchmark.h
$(CXX) $< -c $(CFLAGS) $(MEMFILE_CFLAGS)
memfile_ubench: memfile_ubench.o benchmark.o
diff --git a/tests/tools/dhcp-ubench/benchmark.cc b/tests/tools/dhcp-ubench/benchmark.cc
index 09eeea7..66765f5 100644
--- a/tests/tools/dhcp-ubench/benchmark.cc
+++ b/tests/tools/dhcp-ubench/benchmark.cc
@@ -15,6 +15,7 @@
#include <iostream>
#include <stdlib.h>
#include <string.h>
+#include <boost/lexical_cast.hpp>
#include "benchmark.h"
using namespace std;
@@ -24,11 +25,13 @@ uBenchmark::uBenchmark(uint32_t iterations, const std::string& dbname,
const std::string& host /* = "" */,
const std::string& user /* = "" */,
const std::string& pass /* = "" */)
- :Num_(iterations), Sync_(sync), Verbose_(verbose),
- Hostname_(host), User_(user), Passwd_(pass), DBName_(dbname)
+ :num_(iterations), sync_(sync), verbose_(verbose),
+ hostname_(host), user_(user), passwd_(pass), dbname_(dbname)
{
- memset(ts, 0, sizeof(ts));
+ /// @todo: convert this to user-configurable parameter
+ hitratio_ = 0.9f;
+ memset(ts_, 0, sizeof(ts_));
}
void uBenchmark::usage() {
@@ -57,39 +60,31 @@ void uBenchmark::parseCmdline(int argc, char* const argv[]) {
case 'h':
usage();
case 'm':
- Hostname_ = string(optarg);
+ hostname_ = string(optarg);
break;
case 'u':
- User_ = string(optarg);
+ user_ = string(optarg);
break;
case 'p':
- Passwd_ = string(optarg);
+ passwd_ = string(optarg);
break;
case 'f':
- DBName_ = string(optarg);
+ dbname_ = string(optarg);
break;
case 'n':
- Num_ = strtol(optarg, NULL, 10);
- if (Num_ <= 0) {
+ try {
+ num_ = boost::lexical_cast<int>(optarg);
+ } catch (const boost::bad_lexical_cast &) {
cerr << "Failed to iterations (-n option)." << endl;
usage();
}
break;
case 's':
- if (!strcasecmp(optarg, "yes") || !strcmp(optarg, "1")) {
- Sync_ = true;
- } else {
- Sync_ = false;
- }
+ sync_ = !strcasecmp(optarg, "yes") || !strcmp(optarg, "1");
break;
case 'v':
- if (!strcasecmp(optarg, "yes") || !strcmp(optarg, "1")) {
- Verbose_ = true;
- } else {
- Verbose_ = false;
- }
+ verbose_ = !strcasecmp(optarg, "yes") || !strcmp(optarg, "1");
break;
- case ':':
default:
usage();
}
@@ -124,13 +119,13 @@ void uBenchmark::print_clock(const std::string& operation, uint32_t num,
int uBenchmark::run() {
cout << "Starting test. Parameters:" << endl
- << "Number of iterations : " << Num_ << endl
- << "Sync/async : " << (Sync_ ? "sync" : "async") << endl
- << "Verbose : " << (Verbose_ ? "verbose" : "quiet") << endl
- << "Database name : " << DBName_ << endl
- << "MySQL hostname : " << Hostname_ << endl
- << "MySQL username : " << User_ << endl
- << "MySQL password : " << Passwd_ << endl << endl;
+ << "Number of iterations : " << num_ << endl
+ << "Sync/async : " << (sync_ ? "sync" : "async") << endl
+ << "Verbose : " << (verbose_ ? "verbose" : "quiet") << endl
+ << "Database name : " << dbname_ << endl
+ << "MySQL hostname : " << hostname_ << endl
+ << "MySQL username : " << user_ << endl
+ << "MySQL password : " << passwd_ << endl << endl;
srandom(time(NULL));
@@ -138,19 +133,19 @@ int uBenchmark::run() {
try {
connect();
- clock_gettime(CLOCK_REALTIME, &ts[0]);
+ clock_gettime(CLOCK_REALTIME, &ts_[0]);
createLease4Test();
- clock_gettime(CLOCK_REALTIME, &ts[1]);
+ clock_gettime(CLOCK_REALTIME, &ts_[1]);
searchLease4Test();
- clock_gettime(CLOCK_REALTIME, &ts[2]);
+ clock_gettime(CLOCK_REALTIME, &ts_[2]);
updateLease4Test();
- clock_gettime(CLOCK_REALTIME, &ts[3]);
+ clock_gettime(CLOCK_REALTIME, &ts_[3]);
deleteLease4Test();
- clock_gettime(CLOCK_REALTIME, &ts[4]);
+ clock_gettime(CLOCK_REALTIME, &ts_[4]);
disconnect();
@@ -159,10 +154,10 @@ int uBenchmark::run() {
return (-1);
}
- print_clock("Create leases4", Num_, ts[0], ts[1]);
- print_clock("Search leases4", Num_, ts[1], ts[2]);
- print_clock("Update leases4", Num_, ts[2], ts[3]);
- print_clock("Delete leases4", Num_, ts[3], ts[4]);
+ print_clock("Create leases4", num_, ts_[0], ts_[1]);
+ print_clock("Search leases4", num_, ts_[1], ts_[2]);
+ print_clock("Update leases4", num_, ts_[2], ts_[3]);
+ print_clock("Delete leases4", num_, ts_[3], ts_[4]);
return (0);
}
diff --git a/tests/tools/dhcp-ubench/benchmark.h b/tests/tools/dhcp-ubench/benchmark.h
index d051047..33202e5 100644
--- a/tests/tools/dhcp-ubench/benchmark.h
+++ b/tests/tools/dhcp-ubench/benchmark.h
@@ -173,25 +173,32 @@ protected:
void usage();
/// Number of operations (e.g. insert lease num times)
- uint32_t Num_;
+ uint32_t num_;
/// Synchronous or asynchonous mode?
- bool Sync_;
+ bool sync_;
/// Should the test print out extra information?
- bool Verbose_;
+ bool verbose_;
// DB parameters
- std::string Hostname_; // used by MySQL only
- std::string User_; // used by MySQL only
- std::string Passwd_; // used by MySQL only
- std::string DBName_; // used by MySQL, SQLite and memfile
+ std::string hostname_; // used by MySQL only
+ std::string user_; // used by MySQL only
+ std::string passwd_; // used by MySQL only
+ std::string dbname_; // used by MySQL, SQLite and memfile
+
+ /// @brief hit ratio for search test (must be between 0.0 and 1.0)
+ ///
+ /// This parameter is used in seatch. The formula causes the search
+ /// to find something a lease in 90% cases of hit ratio is 0.9.
+ ///
+ float hitratio_;
/// benchmarks must generate the leases starting from 1.0.0.0 address
const static uint32_t BASE_ADDR4 = 0x01000000;
/// five timestamps (1 at the beginning and 4 after each step)
- struct timespec ts[5];
+ struct timespec ts_[5];
};
#endif
diff --git a/tests/tools/dhcp-ubench/memfile_ubench.cc b/tests/tools/dhcp-ubench/memfile_ubench.cc
index 39f952a..cd589b4 100644
--- a/tests/tools/dhcp-ubench/memfile_ubench.cc
+++ b/tests/tools/dhcp-ubench/memfile_ubench.cc
@@ -149,8 +149,9 @@ bool memfile_LeaseMgr::addLease(Lease4Ptr lease) {
Lease4Ptr memfile_LeaseMgr::getLease(uint32_t addr) {
leaseIt x = ip4Hash_.find(addr);
- if (x != ip4Hash_.end())
+ if (x != ip4Hash_.end()) {
return x->second; // found
+ }
// not found
return Lease4Ptr();
@@ -182,26 +183,24 @@ memfile_uBenchmark::memfile_uBenchmark(const string& filename,
uint32_t num_iterations,
bool sync,
bool verbose)
- :uBenchmark(num_iterations, filename, sync, verbose),
- Filename_(filename) {
-
+ :uBenchmark(num_iterations, filename, sync, verbose) {
}
void memfile_uBenchmark::connect() {
try {
- LeaseMgr_ = new memfile_LeaseMgr(Filename_, Sync_);
+ leaseMgr_ = new memfile_LeaseMgr(dbname_, sync_);
} catch (const std::string& e) {
failure(e.c_str());
}
}
void memfile_uBenchmark::disconnect() {
- delete LeaseMgr_;
- LeaseMgr_ = NULL;
+ delete leaseMgr_;
+ leaseMgr_ = NULL;
}
void memfile_uBenchmark::createLease4Test() {
- if (!LeaseMgr_) {
+ if (!leaseMgr_) {
throw "No LeaseMgr instantiated.";
}
@@ -234,7 +233,7 @@ void memfile_uBenchmark::createLease4Test() {
}
vector<uint8_t> client_id(client_id_tmp, client_id_tmp + 19);
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
cltt++;
@@ -251,10 +250,10 @@ void memfile_uBenchmark::createLease4Test() {
lease->fqdn_fwd = fqdn_fwd;
lease->fqdn_rev = fqdn_rev;
- if (!LeaseMgr_->addLease(lease)) {
+ if (!leaseMgr_->addLease(lease)) {
failure("addLease() failed");
} else {
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
};
@@ -265,7 +264,7 @@ void memfile_uBenchmark::createLease4Test() {
}
void memfile_uBenchmark::searchLease4Test() {
- if (!LeaseMgr_) {
+ if (!leaseMgr_) {
throw "No LeaseMgr instantiated.";
}
@@ -274,11 +273,11 @@ void memfile_uBenchmark::searchLease4Test() {
printf("RETRIEVE: ");
- for (uint32_t i = 0; i < Num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % int(Num_ / hitRatio);
+ for (uint32_t i = 0; i < num_; i++) {
+ uint32_t x = BASE_ADDR4 + random() % int(num_ / hitRatio);
- Lease4Ptr lease = LeaseMgr_->getLease(x);
- if (Verbose_) {
+ Lease4Ptr lease = leaseMgr_->getLease(x);
+ if (verbose_) {
if (lease) {
printf(".");
} else {
@@ -291,7 +290,7 @@ void memfile_uBenchmark::searchLease4Test() {
}
void memfile_uBenchmark::updateLease4Test() {
- if (!LeaseMgr_) {
+ if (!leaseMgr_) {
throw "No LeaseMgr instantiated.";
}
@@ -299,17 +298,17 @@ void memfile_uBenchmark::updateLease4Test() {
time_t cltt = time(NULL);
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % Num_;
+ uint32_t x = BASE_ADDR4 + random() % num_;
- Lease4Ptr lease = LeaseMgr_->updateLease(x, cltt);
+ Lease4Ptr lease = leaseMgr_->updateLease(x, cltt);
if (!lease) {
stringstream tmp;
tmp << "UPDATE failed for lease " << hex << x << dec;
failure(tmp.str().c_str());
}
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
@@ -318,22 +317,22 @@ void memfile_uBenchmark::updateLease4Test() {
}
void memfile_uBenchmark::deleteLease4Test() {
- if (!LeaseMgr_) {
+ if (!leaseMgr_) {
throw "No LeaseMgr instantiated.";
}
printf("DELETE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
uint32_t x = BASE_ADDR4 + i;
- if (!LeaseMgr_->deleteLease(x)) {
+ if (!leaseMgr_->deleteLease(x)) {
stringstream tmp;
tmp << "UPDATE failed for lease " << hex << x << dec;
failure(tmp.str().c_str());
}
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
diff --git a/tests/tools/dhcp-ubench/memfile_ubench.h b/tests/tools/dhcp-ubench/memfile_ubench.h
index 250949f..51b7313 100644
--- a/tests/tools/dhcp-ubench/memfile_ubench.h
+++ b/tests/tools/dhcp-ubench/memfile_ubench.h
@@ -99,8 +99,5 @@ public:
protected:
/// Lease Manager (concrete backend implementation, based on STL maps)
- memfile_LeaseMgr * LeaseMgr_;
-
- /// Name of the lease file.
- std::string Filename_;
+ memfile_LeaseMgr * leaseMgr_;
};
diff --git a/tests/tools/dhcp-ubench/mysql_ubench.cc b/tests/tools/dhcp-ubench/mysql_ubench.cc
index 7fdda24..9fdbd90 100644
--- a/tests/tools/dhcp-ubench/mysql_ubench.cc
+++ b/tests/tools/dhcp-ubench/mysql_ubench.cc
@@ -50,8 +50,8 @@ void MySQL_uBenchmark::connect() {
cout << "MySQL library init successful." << endl;
}
- if (!mysql_real_connect(Conn_, Hostname_.c_str(), User_.c_str(),
- Passwd_.c_str(), DBName_.c_str(), 0, NULL, 0)) {
+ if (!mysql_real_connect(Conn_, hostname_.c_str(), user_.c_str(),
+ passwd_.c_str(), dbname_.c_str(), 0, NULL, 0)) {
failure("connecting to MySQL server");
} else {
cout << "MySQL connection established." << endl;
@@ -63,7 +63,7 @@ void MySQL_uBenchmark::connect() {
}
q = "ALTER TABLE lease4 engine=";
- if (Sync_) {
+ if (sync_) {
q += "InnoDB";
} else {
q += "MyISAM";
@@ -112,7 +112,7 @@ void MySQL_uBenchmark::createLease4Test() {
client_id[i] = 33 + i;
}
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
stringstream cltt;
cltt << "2012-07-11 15:43:" << (i % 60);
@@ -141,7 +141,7 @@ void MySQL_uBenchmark::createLease4Test() {
// something failed.
failure("INSERT query");
} else {
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
};
@@ -154,9 +154,6 @@ void MySQL_uBenchmark::searchLease4Test() {
throw "Not connected to MySQL server.";
}
- // this formula should roughly find something a lease in 90% cases
- float hitRatio = 0.9;
-
/* cout << "range=" << int(Num_ / hitRatio) << " minAddr=" << hex
<< BASE_ADDR4 << " maxAddr=" << BASE_ADDR4 + int(Num_ / hitRatio)
<< dec << endl; */
@@ -164,9 +161,9 @@ void MySQL_uBenchmark::searchLease4Test() {
printf("RETRIEVE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % int(Num_ / hitRatio);
+ uint32_t x = BASE_ADDR4 + random() % int(num_ / hitratio_);
char query[2000];
sprintf(query, "SELECT lease_id,addr,hwaddr,client_id,valid_lft,"
@@ -199,12 +196,12 @@ void MySQL_uBenchmark::searchLease4Test() {
}
mysql_free_result(result);
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
} else {
- if (Verbose_) {
+ if (verbose_) {
printf("x");
}
}
@@ -220,15 +217,15 @@ void MySQL_uBenchmark::updateLease4Test() {
printf("UPDATE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % Num_;
+ uint32_t x = BASE_ADDR4 + random() % num_;
char query[2000];
sprintf(query, "UPDATE lease4 SET valid_lft=1002, cltt=now() WHERE addr=%d", x);
mysql_real_query(Conn_, query, strlen(query));
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
@@ -243,7 +240,7 @@ void MySQL_uBenchmark::deleteLease4Test() {
printf("DELETE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
uint32_t x = BASE_ADDR4 + i;
@@ -251,7 +248,7 @@ void MySQL_uBenchmark::deleteLease4Test() {
sprintf(query, "DELETE FROM lease4 WHERE addr=%d", x);
mysql_real_query(Conn_, query, strlen(query));
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
diff --git a/tests/tools/dhcp-ubench/sqlite_ubench.cc b/tests/tools/dhcp-ubench/sqlite_ubench.cc
index 001762a..9de9f1d 100644
--- a/tests/tools/dhcp-ubench/sqlite_ubench.cc
+++ b/tests/tools/dhcp-ubench/sqlite_ubench.cc
@@ -27,40 +27,40 @@ SQLite_uBenchmark::SQLite_uBenchmark(const string& filename,
uint32_t num_iterations,
bool sync, bool verbose)
:uBenchmark(num_iterations, filename, sync, verbose),
- DB_(NULL) {
+ db_(NULL) {
}
void SQLite_uBenchmark::connect() {
- int result = sqlite3_open(DBName_.c_str(), &DB_);
+ int result = sqlite3_open(dbname_.c_str(), &db_);
if (result) {
- sqlite3_open(DBName_.c_str(), &DB_);
+ sqlite3_open(dbname_.c_str(), &db_);
failure("Failed to open DB file");
}
- sqlite3_exec(DB_, "DELETE FROM lease4", NULL, NULL, NULL);
+ sqlite3_exec(db_, "DELETE FROM lease4", NULL, NULL, NULL);
- if (Sync_) {
- sqlite3_exec(DB_, "PRAGMA synchronous = ON", NULL, NULL, NULL);
+ if (sync_) {
+ sqlite3_exec(db_, "PRAGMA synchronous = ON", NULL, NULL, NULL);
} else {
- sqlite3_exec(DB_, "PRAGMA synchronous = OFF", NULL, NULL, NULL);
+ sqlite3_exec(db_, "PRAGMA synchronous = OFF", NULL, NULL, NULL);
}
// see http://www.sqlite.org/pragma.html#pragma_journal_mode
// for detailed explanation. Available modes: DELETE, TRUNCATE,
// PERSIST, MEMORY, WAL, OFF
- sqlite3_exec(DB_, "PRAGMA journal_mode = OFF", NULL, NULL, NULL);
+ sqlite3_exec(db_, "PRAGMA journal_mode = OFF", NULL, NULL, NULL);
}
void SQLite_uBenchmark::disconnect() {
- if (DB_) {
- sqlite3_close(DB_);
- DB_ = NULL;
+ if (db_) {
+ sqlite3_close(db_);
+ db_ = NULL;
}
}
void SQLite_uBenchmark::createLease4Test() {
- if (!DB_) {
+ if (!db_) {
throw "SQLite connection is closed.";
}
@@ -93,7 +93,7 @@ void SQLite_uBenchmark::createLease4Test() {
// query formatting, let's get rid of it
client_id[127] = 0; // workaround
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
stringstream cltt;
cltt << "2012-07-11 15:43:" << (i % 60);
@@ -112,14 +112,14 @@ void SQLite_uBenchmark::createLease4Test() {
hostname.c_str(), (fqdn_fwd?"true":"false"), (fqdn_rev?"true":"false"));
// printf("QUERY=[%s]\n", query);
- int result = sqlite3_exec(DB_, query, NULL, 0, &errorMsg);
+ int result = sqlite3_exec(db_, query, NULL, 0, &errorMsg);
if (result != SQLITE_OK) {
stringstream tmp;
tmp << "INSERT error:" << errorMsg;
failure(tmp.str().c_str());
} else {
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
};
@@ -145,18 +145,15 @@ static int search_callback(void *counter, int /*argc*/, char** /*argv*/,
}
void SQLite_uBenchmark::searchLease4Test() {
- if (!DB_) {
+ if (!db_) {
throw "SQLite connection is closed.";
}
- // this formula should roughly find something a lease in 90% cases
- float hitRatio = 0.5;
-
printf("RETRIEVE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % int(Num_ / hitRatio);
+ uint32_t x = BASE_ADDR4 + random() % int(num_ / hitratio_);
char* errorMsg = NULL;
@@ -166,7 +163,7 @@ void SQLite_uBenchmark::searchLease4Test() {
sprintf(query, "SELECT lease_id,addr,hwaddr,client_id,valid_lft,"
"cltt,pool_id,fixed,hostname,fqdn_fwd,fqdn_rev "
"FROM lease4 where addr=%d", x);
- int result = sqlite3_exec(DB_, query, search_callback, &cnt, &errorMsg);
+ int result = sqlite3_exec(db_, query, search_callback, &cnt, &errorMsg);
if (result != SQLITE_OK) {
stringstream tmp;
tmp << "SELECT failed: " << errorMsg;
@@ -174,11 +171,11 @@ void SQLite_uBenchmark::searchLease4Test() {
}
if (cnt) {
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
} else {
- if (Verbose_) {
+ if (verbose_) {
printf("X");
}
}
@@ -189,27 +186,27 @@ void SQLite_uBenchmark::searchLease4Test() {
}
void SQLite_uBenchmark::updateLease4Test() {
- if (!DB_) {
+ if (!db_) {
throw "SQLite connection is closed.";
}
printf("UPDATE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
- uint32_t x = BASE_ADDR4 + random() % Num_;
+ uint32_t x = BASE_ADDR4 + random() % num_;
char* errorMsg = NULL;
char query[2000];
sprintf(query, "UPDATE lease4 SET valid_lft=1002, cltt='now' WHERE addr=%d", x);
- int result = sqlite3_exec(DB_, query, NULL /* no callback here*/, 0, &errorMsg);
+ int result = sqlite3_exec(db_, query, NULL /* no callback here*/, 0, &errorMsg);
if (result != SQLITE_OK) {
stringstream tmp;
tmp << "UPDATE error:" << errorMsg;
failure(tmp.str().c_str());
}
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
@@ -218,26 +215,26 @@ void SQLite_uBenchmark::updateLease4Test() {
}
void SQLite_uBenchmark::deleteLease4Test() {
- if (!DB_) {
+ if (!db_) {
throw "SQLite connection is closed.";
}
printf("DELETE: ");
- for (uint32_t i = 0; i < Num_; i++) {
+ for (uint32_t i = 0; i < num_; i++) {
uint32_t x = BASE_ADDR4 + i;
char* errorMsg = NULL;
char query[2000];
sprintf(query, "DELETE FROM lease4 WHERE addr=%d", x);
- int result = sqlite3_exec(DB_, query, NULL /* no callback here*/, 0, &errorMsg);
+ int result = sqlite3_exec(db_, query, NULL /* no callback here*/, 0, &errorMsg);
if (result != SQLITE_OK) {
stringstream tmp;
tmp << "DELETE error:" << errorMsg;
failure(tmp.str().c_str());
}
- if (Verbose_) {
+ if (verbose_) {
printf(".");
}
}
diff --git a/tests/tools/dhcp-ubench/sqlite_ubench.h b/tests/tools/dhcp-ubench/sqlite_ubench.h
index a066ec9..366b50a 100644
--- a/tests/tools/dhcp-ubench/sqlite_ubench.h
+++ b/tests/tools/dhcp-ubench/sqlite_ubench.h
@@ -70,5 +70,5 @@ public:
protected:
/// Handle to SQLite database connection.
- sqlite3 *DB_;
+ sqlite3 *db_;
};
More information about the bind10-changes
mailing list