BIND 10 trac1959, updated. c47f7da793ecc7bb0486d6f78b9405803c2d2701 [1959] Implemented diagnostics selectors.
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 24 20:29:37 UTC 2012
The branch, trac1959 has been updated
via c47f7da793ecc7bb0486d6f78b9405803c2d2701 (commit)
via b753e8ebd1f6b3e16628e22640efab38fff2cac8 (commit)
from 23c33b29ab5841a3fe5469d2056708e707938998 (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 c47f7da793ecc7bb0486d6f78b9405803c2d2701
Author: Marcin Siodelski <marcin at isc.org>
Date: Fri Aug 24 22:29:17 2012 +0200
[1959] Implemented diagnostics selectors.
commit b753e8ebd1f6b3e16628e22640efab38fff2cac8
Author: Marcin Siodelski <marcin at isc.org>
Date: Fri Aug 24 16:09:36 2012 +0200
[1959] End the program gracefully if interrupted.
-----------------------------------------------------------------------
Summary of changes:
tests/tools/perfdhcp/command_options.cc | 92 ++++++++++
tests/tools/perfdhcp/command_options.h | 3 +
tests/tools/perfdhcp/main.cc | 6 +-
tests/tools/perfdhcp/stats_mgr.h | 2 +-
tests/tools/perfdhcp/test_control.cc | 209 ++++++++++++++++++----
tests/tools/perfdhcp/test_control.h | 35 +++-
tests/tools/perfdhcp/tests/stats_mgr_unittest.cc | 4 +-
7 files changed, 314 insertions(+), 37 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/command_options.cc b/tests/tools/perfdhcp/command_options.cc
index 14a2e65..fcdb7bd 100644
--- a/tests/tools/perfdhcp/command_options.cc
+++ b/tests/tools/perfdhcp/command_options.cc
@@ -635,6 +635,98 @@ CommandOptions::nonEmptyString(const std::string& errmsg) const {
}
void
+CommandOptions::printCommandLine() const {
+ std::cout << "IPv" << static_cast<int>(ipversion_) << std::endl;
+ if (exchange_mode_ == DO_SA) {
+ if (ipversion_ == 4) {
+ std::cout << "DISCOVER-OFFER only" << std::endl;
+ } else {
+ std::cout << "SOLICIT-ADVERETISE only" << std::endl;
+ }
+ }
+ if (rate_ != 0) {
+ std::cout << "rate[1/s]=" << rate_ << std::endl;
+ }
+ if (report_delay_ != 0) {
+ std::cout << "report[s]=" << report_delay_ << std::endl;
+ }
+ if (clients_num_ != 0) {
+ std::cout << "clients=" << clients_num_ << std::endl;
+ }
+ for (int i = 0; i < base_.size(); ++i) {
+ std::cout << "base[" << i << "]=" << base_[i] << std::endl;
+ }
+ for (int i = 0; i < num_request_.size(); ++i) {
+ std::cout << "num-request[" << i << "]=" << num_request_[i] << std::endl;
+ }
+ if (period_ != 0) {
+ std::cout << "test-period=" << period_ << std::endl;
+ }
+ for (int i = 0; i < drop_time_.size(); ++i) {
+ std::cout << "drop-time[" << i << "]=" << drop_time_[i] << std::endl;
+ }
+ for (int i = 0; i < max_drop_.size(); ++i) {
+ std::cout << "max-drop{" << i << "]=" << max_drop_[i] << std::endl;
+ }
+ for (int i = 0; i < max_pdrop_.size(); ++i) {
+ std::cout << "max-pdrop{" << i << "]=" << max_pdrop_[i] << std::endl;
+ }
+ if (preload_ != 0) {
+ std::cout << "preload=" << preload_ << std::endl;
+ }
+ std::cout << "aggressivity=" << aggressivity_ << std::endl;
+ if (getLocalPort() != 0) {
+ std::cout << "local-port=" << local_port_ << std::endl;
+ }
+ if (seeded_) {
+ std::cout << "seed=" << seed_ << std::endl;
+ }
+ if (broadcast_) {
+ std::cout << "broadcast" << std::endl;
+ }
+ if (rapid_commit_) {
+ std::cout << "rapid-commit" << std::endl;
+ }
+ if (use_first_) {
+ std::cout << "use-first" << std::endl;
+ }
+ for (int i = 0; i < template_file_.size(); ++i) {
+ std::cout << "template-file[" << i << "]=" << template_file_[i] << std::endl;
+ }
+ for (int i = 0; i < xid_offset_.size(); ++i) {
+ std::cout << "xid-offset[" << i << "]=" << xid_offset_[i] << std::endl;
+ }
+ if (elp_offset_ != 0) {
+ std::cout << "elp-offset=" << elp_offset_ << std::endl;
+ }
+ for (int i = 0; i < rnd_offset_.size(); ++i) {
+ std::cout << "rnd-offset[" << i << "]=" << rnd_offset_[i] << std::endl;
+ }
+ if (sid_offset_ != 0) {
+ std::cout << "sid-offset=" << sid_offset_ << std::endl;
+ }
+ if (rip_offset_ != 0) {
+ std::cout << "rip-offset=" << rip_offset_ << std::endl;
+ }
+ if (!diags_.empty()) {
+ std::cout << "diagnostic-selectors=" << diags_ << std::endl;
+ }
+ if (!wrapped_.empty()) {
+ std::cout << "wrapped=" << wrapped_ << std::endl;
+ }
+ if (!localname_.empty()) {
+ if (is_interface_) {
+ std::cout << "interface=" << localname_ << std::endl;
+ } else {
+ std::cout << "local-addr=" << localname_ << std::endl;
+ }
+ }
+ if (!server_name_.empty()) {
+ std::cout << "server=" << server_name_ << std::endl;
+ }
+}
+
+void
CommandOptions::usage() const {
fprintf(stdout, "%s",
"perfdhcp [-hv] [-4|-6] [-r<rate>] [-t<report>] [-R<range>] [-b<base>]\n"
diff --git a/tests/tools/perfdhcp/command_options.h b/tests/tools/perfdhcp/command_options.h
index b75c438..b9f2c3a 100644
--- a/tests/tools/perfdhcp/command_options.h
+++ b/tests/tools/perfdhcp/command_options.h
@@ -230,6 +230,9 @@ public:
///
/// \return server name
std::string getServerName() const { return server_name_; }
+
+ /// \brief Prints command line arguments.
+ void printCommandLine() const;
/// \brief Print usage
///
diff --git a/tests/tools/perfdhcp/main.cc b/tests/tools/perfdhcp/main.cc
index d70b8fa..0c706a2 100644
--- a/tests/tools/perfdhcp/main.cc
+++ b/tests/tools/perfdhcp/main.cc
@@ -38,7 +38,11 @@ main(int argc, char* argv[]) {
TestControl& test_control = TestControl::instance();
test_control.run();
} catch (isc::Exception& e) {
- std::cout << "Error starting perfdhcp: " << e.what() << std::endl;
+ std::cout << "Error running perfdhcp: " << e.what() << std::endl;
+ std::string diags(command_options.getDiags());
+ if (diags.find('e') != std::string::npos) {
+ std::cout << "Fatal error" << std::endl;
+ }
return(1);
}
return(0);
diff --git a/tests/tools/perfdhcp/stats_mgr.h b/tests/tools/perfdhcp/stats_mgr.h
index 7ea5223..806fb8d 100644
--- a/tests/tools/perfdhcp/stats_mgr.h
+++ b/tests/tools/perfdhcp/stats_mgr.h
@@ -834,7 +834,7 @@ public:
///
/// \param counter_key key poitinh to the counter in the counters map.
/// \return pointer to specified counter after incrementation.
- const CustomCounter& IncrementCounter(const std::string& counter_key) {
+ const CustomCounter& incrementCounter(const std::string& counter_key) {
CustomCounterPtr counter = getCounter(counter_key);
return(++(*counter));
}
diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc
index af59105..c58631f 100644
--- a/tests/tools/perfdhcp/test_control.cc
+++ b/tests/tools/perfdhcp/test_control.cc
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
+#include <signal.h>
#include <boost/date_time/posix_time/posix_time.hpp>
@@ -37,6 +38,8 @@ using namespace isc::asiolink;
namespace isc {
namespace perfdhcp {
+bool TestControl::interrupted_ = false;
+
TestControl::TestControlSocket::TestControlSocket(int socket) :
socket_(socket),
addr_("127.0.0.1") {
@@ -82,34 +85,55 @@ TestControl::TestControl() {
reset();
}
+std::string
+TestControl::byte2Hex(const uint8_t b) const {
+ const int b1 = b / 16;
+ const int b0 = b % 16;
+ ostringstream stream;
+ stream << std::hex << b1 << b0 << std::dec;
+ return stream.str();
+}
+
bool
TestControl::checkExitConditions() const {
+ if (interrupted_) {
+ return(true);
+ }
CommandOptions& options = CommandOptions::instance();
- // Check if test period passed..
+ bool test_period_reached = false;
+ // Check if test period passed.
if (options.getPeriod() != 0) {
if (options.getIpVersion() == 4) {
time_period period(stats_mgr4_->getTestPeriod());
if (period.length().total_seconds() >= options.getPeriod()) {
- return true;
+ test_period_reached = true;
}
} else if (options.getIpVersion() == 6) {
time_period period = stats_mgr6_->getTestPeriod();
if (period.length().total_seconds() >= options.getPeriod()) {
- return true;
+ test_period_reached = true;
}
}
}
+ if (test_period_reached) {
+ if (testDiags('e')) {
+ std::cout << "Reached test period." << std::endl;
+ }
+ return(true);
+ }
+
+ bool max_requests = false;
// Check if we reached maximum number of DISCOVER/SOLICIT sent.
if (options.getNumRequests().size() > 0) {
if (options.getIpVersion() == 4) {
if (getSentPacketsNum(StatsMgr4::XCHG_DO) >=
options.getNumRequests()[0]) {
- return(true);
+ max_requests = true;
}
} else if (options.getIpVersion() == 6) {
if (stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_SA) >=
options.getNumRequests()[0]) {
- return(true);
+ max_requests = true;
}
}
}
@@ -118,26 +142,34 @@ TestControl::checkExitConditions() const {
if (options.getIpVersion() == 4) {
if (stats_mgr4_->getSentPacketsNum(StatsMgr4::XCHG_RA) >=
options.getNumRequests()[1]) {
- return(true);
+ max_requests = true;
}
} else if (options.getIpVersion() == 6) {
if (stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_RR) >=
options.getNumRequests()[1]) {
- return(true);
+ max_requests = true;
}
}
}
+ if (max_requests) {
+ if (testDiags('e')) {
+ std::cout << "Reached test period." << std::endl;
+ }
+ return(true);
+ }
+
// Check if we reached maximum number of drops of OFFER/ADVERTISE packets.
+ bool max_drops = false;
if (options.getMaxDrop().size() > 0) {
if (options.getIpVersion() == 4) {
if (stats_mgr4_->getDroppedPacketsNum(StatsMgr4::XCHG_DO) >=
options.getMaxDrop()[0]) {
- return(true);
+ max_drops = true;
}
} else if (options.getIpVersion() == 6) {
if (stats_mgr6_->getDroppedPacketsNum(StatsMgr6::XCHG_SA) >=
options.getMaxDrop()[0]) {
- return(true);
+ max_drops = true;
}
}
}
@@ -146,30 +178,39 @@ TestControl::checkExitConditions() const {
if (options.getIpVersion() == 4) {
if (stats_mgr4_->getDroppedPacketsNum(StatsMgr4::XCHG_RA) >=
options.getMaxDrop()[1]) {
- return(true);
+ max_drops = true;
}
} else if (options.getIpVersion() == 6) {
if (stats_mgr6_->getDroppedPacketsNum(StatsMgr6::XCHG_RR) >=
options.getMaxDrop()[1]) {
- return(true);
+ max_drops = true;
}
}
}
+ if (max_drops) {
+ if (testDiags('e')) {
+ std::cout << "Reached maximum drops number." << std::endl;
+ }
+ return(true);
+ }
+
// Check if we reached maximum drops percentage of OFFER/ADVERTISE packets.
+ bool max_pdrops = false;
if (options.getMaxDropPercentage().size() > 0) {
if (options.getIpVersion() == 4) {
if ((stats_mgr4_->getSentPacketsNum(StatsMgr4::XCHG_DO) > 10) &&
((100. * stats_mgr4_->getDroppedPacketsNum(StatsMgr4::XCHG_DO) /
stats_mgr4_->getSentPacketsNum(StatsMgr4::XCHG_DO)) >=
options.getMaxDropPercentage()[0])) {
- return(true);
+ max_pdrops = true;
+
}
} else if (options.getIpVersion() == 6) {
if ((stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_SA) > 10) &&
((100. * stats_mgr6_->getDroppedPacketsNum(StatsMgr6::XCHG_SA) /
stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_SA)) >=
options.getMaxDropPercentage()[0])) {
- return(true);
+ max_pdrops = true;
}
}
}
@@ -180,17 +221,24 @@ TestControl::checkExitConditions() const {
((100. * stats_mgr4_->getDroppedPacketsNum(StatsMgr4::XCHG_RA) /
stats_mgr4_->getSentPacketsNum(StatsMgr4::XCHG_RA)) >=
options.getMaxDropPercentage()[1])) {
- return(true);
+ max_pdrops = true;
}
} else if (options.getIpVersion() == 6) {
if ((stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_RR) > 10) &&
((100. * stats_mgr6_->getDroppedPacketsNum(StatsMgr6::XCHG_RR) /
stats_mgr6_->getSentPacketsNum(StatsMgr6::XCHG_RR)) >=
options.getMaxDropPercentage()[1])) {
- return(true);
+ max_pdrops = true;
}
}
}
+ if (max_pdrops) {
+ if (testDiags('e')) {
+ std::cout << "Reached maximum percentage of drops." << std::endl;
+ }
+ return(true);
+ }
+
return(false);
}
@@ -329,9 +377,6 @@ TestControl::getNextExchangesNum() const {
uint64_t due_exchanges = 0;
// Get current time.
ptime now(microsec_clock::universal_time());
- // The due time indicates when we should start sending next chunk
- // of packets. If it is already due time, we should calculate
- // how many packets to send.
if (now >= send_due_) {
// If rate is specified from the command line we have to
// synchornize with it.
@@ -385,6 +430,11 @@ TestControl::getSentPacketsNum(const ExchangeType xchg_type) const {
}
void
+TestControl::handleInterrupt(int) {
+ interrupted_ = true;
+}
+
+void
TestControl::initPacketTemplates() {
CommandOptions& options = CommandOptions::instance();
std::vector<std::string> template_files = options.getTemplateFiles();
@@ -415,6 +465,19 @@ TestControl::initializeStatsMgr() {
stats_mgr6_->addExchangeStats(StatsMgr6::XCHG_RR);
}
}
+ if (testDiags('i')) {
+ if (options.getIpVersion() == 4) {
+ stats_mgr4_->addCustomCounter("latesend", "Late sent packets");
+ stats_mgr4_->addCustomCounter("shortwait", "Short waits for packets");
+ stats_mgr4_->addCustomCounter("multircvd", "Multiple packets receives");
+ // stats_mgr4_->addCustomCounter("latercvd", "Late received packets");
+ } else if (options.getIpVersion() == 6) {
+ stats_mgr6_->addCustomCounter("latesend", "Late sent packets");
+ stats_mgr6_->addCustomCounter("shortwait", "Short waits for packets");
+ stats_mgr6_->addCustomCounter("multircvd", "Multiple packets receives");
+ // stats_mgr6_->addCustomCounter("latercvd", "Late received packets");
+ }
+ }
}
int
@@ -506,6 +569,23 @@ TestControl::openSocket() const {
}
void
+TestControl::printDiagnostics() const {
+ CommandOptions& options = CommandOptions::instance();
+ if (testDiags('a')) {
+ // Print all command line parameters.
+ options.printCommandLine();
+
+ // Print MAC and DUID.
+ std::cout << "Set MAC to " << vector2Hex(options.getMacPrefix(), "::")
+ << std::endl;
+ if (options.getDuidPrefix().size() > 0) {
+ std::cout << "Set DUID to " << vector2Hex(options.getDuidPrefix()) << std::endl;
+ }
+
+ }
+}
+
+void
TestControl::printRate() const {
double rate = 0;
CommandOptions& options = CommandOptions::instance();
@@ -553,15 +633,37 @@ TestControl::printStats() const {
"hasn't been initialized");
}
stats_mgr4_->printStats();
+ if (testDiags('i')) {
+ stats_mgr4_->printCustomCounters();
+ }
} else if (options.getIpVersion() == 6) {
if (!stats_mgr6_) {
isc_throw(InvalidOperation, "Statistics Manager for DHCPv6 "
"hasn't been initialized");
}
stats_mgr6_->printStats();
+ if (testDiags('i')) {
+ stats_mgr6_->printCustomCounters();
+ }
}
}
+std::string
+TestControl::vector2Hex(const std::vector<uint8_t>& vec,
+ const std::string& separator /* ="" */) const {
+ std::ostringstream stream;
+ for (std::vector<uint8_t>::const_iterator it = vec.begin();
+ it != vec.end();
+ ++it) {
+ if (it == vec.begin()) {
+ stream << byte2Hex(*it);
+ } else {
+ stream << separator << byte2Hex(*it);
+ }
+ }
+ return(stream.str());
+}
+
void
TestControl::receivePacket4(const TestControlSocket& socket,
const Pkt4Ptr& pkt4) {
@@ -599,12 +701,17 @@ void
TestControl::receivePackets(const TestControlSocket& socket) {
int timeout = 0;
bool receiving = true;
+ uint64_t received = 0;
while (receiving) {
if (CommandOptions::instance().getIpVersion() == 4) {
Pkt4Ptr pkt4 = IfaceMgr::instance().receive4(timeout);
if (!pkt4) {
receiving = false;
} else {
+ ++received;
+ if ((received > 1) && testDiags('i')) {
+ stats_mgr4_->incrementCounter("multircvd");
+ }
pkt4->unpack();
receivePacket4(socket, pkt4);
}
@@ -613,6 +720,10 @@ TestControl::receivePackets(const TestControlSocket& socket) {
if (!pkt6) {
receiving = false;
} else {
+ ++received;
+ if ((received > 1) && testDiags('i')) {
+ stats_mgr6_->incrementCounter("multircvd");
+ }
if (pkt6->unpack()) {
receivePacket6(socket, pkt6);
}
@@ -692,13 +803,11 @@ TestControl::reset() {
transid_gen_.reset();
transid_gen_ = TransidGeneratorPtr(new TransidGenerator());
first_packet_serverid_.clear();
+ interrupted_ = false;
}
void
TestControl::run() {
- sent_packets_0_ = 0;
- sent_packets_1_ = 0;
-
// Reset singleton state before test starts.
reset();
@@ -711,6 +820,9 @@ TestControl::run() {
isc_throw(InvalidOperation,
"command options must be parsed before running a test");
}
+
+ printDiagnostics();
+
registerOptionFactories();
TestControlSocket socket(openSocket());
@@ -722,6 +834,9 @@ TestControl::run() {
srandom(options.getSeed());
}
+ // If user interrupts the program we will exit gracefully.
+ signal(SIGINT, TestControl::handleInterrupt);
+
// Preload server with number of packets.
const bool do_preload = true;
for (int i = 0; i < options.getPreload(); ++i) {
@@ -734,14 +849,22 @@ TestControl::run() {
initializeStatsMgr();
- uint64_t packets_sent = 0;
for (;;) {
updateSendDue();
if (checkExitConditions()) {
break;
}
uint64_t packets_due = getNextExchangesNum();
+ if ((packets_due == 0) && testDiags('i')) {
+ if (options.getIpVersion() == 4) {
+ stats_mgr4_->incrementCounter("shortwait");
+ } else if (options.getIpVersion() == 6) {
+ stats_mgr6_->incrementCounter("shortwait");
+ }
+ }
+ // @todo: set non-zero timeout for packets once we implement
+ // microseconds timeout in IfaceMgr.
receivePackets(socket);
for (uint64_t i = packets_due; i > 0; --i) {
@@ -750,19 +873,24 @@ TestControl::run() {
} else {
sendSolicit6(socket);
}
- ++packets_sent;
}
if (options.getReportDelay() > 0) {
printIntermediateStats();
}
}
printStats();
+ if (testDiags('s') && (first_packet_serverid_.size() > 0)) {
+ std::cout << "Server id: " << vector2Hex(first_packet_serverid_) << std::endl;
+ }
+ // Diagnostics flag 'e' means show exit reason.
+ if (testDiags('e')) {
+ std::cout << "Interrupted" << std::endl;
+ }
}
void
TestControl::sendDiscover4(const TestControlSocket& socket,
const bool preload /*= false*/) {
- ++sent_packets_0_;
last_sent_ = microsec_clock::universal_time();
// Generate the MAC address to be passed in the packet.
std::vector<uint8_t> mac_address = generateMacAddress();
@@ -804,7 +932,8 @@ TestControl::sendRequest4(const TestControlSocket& socket,
OptionPtr opt_msg_type = Option::factory(Option::V4, DHO_DHCP_MESSAGE_TYPE,
buf_msg_type);
pkt4->addOption(opt_msg_type);
- if (first_packet_serverid_.size() > 0) {
+ if (CommandOptions::instance().isUseFirst() &&
+ (first_packet_serverid_.size() > 0)) {
pkt4->addOption(Option::factory(Option::V4, DHO_DHCP_SERVER_IDENTIFIER,
first_packet_serverid_));
} else {
@@ -814,8 +943,7 @@ TestControl::sendRequest4(const TestControlSocket& socket,
isc_throw(BadValue, "there is no SERVER_IDENTIFIER option "
<< "in OFFER message");
}
- if (CommandOptions::instance().isUseFirst() &&
- stats_mgr4_->getRcvdPacketsNum(StatsMgr4::XCHG_DO) == 1) {
+ if (stats_mgr4_->getRcvdPacketsNum(StatsMgr4::XCHG_DO) == 1) {
first_packet_serverid_ = opt_serverid->getData();
}
pkt4->addOption(opt_serverid);
@@ -879,7 +1007,8 @@ TestControl::sendRequest6(const TestControlSocket& socket,
isc_throw(Unexpected, "client id not found in received packet");
}
pkt6->addOption(opt_clientid);
- if (first_packet_serverid_.size() > 0) {
+ if (CommandOptions::instance().isUseFirst() &&
+ (first_packet_serverid_.size() > 0)) {
pkt6->addOption(Option::factory(Option::V6, D6O_SERVERID,
first_packet_serverid_));
} else {
@@ -887,8 +1016,7 @@ TestControl::sendRequest6(const TestControlSocket& socket,
if (!opt_serverid) {
isc_throw(Unexpected, "server id not found in received packet");
}
- if (CommandOptions::instance().isUseFirst() &&
- stats_mgr6_->getRcvdPacketsNum(StatsMgr6::XCHG_SA) == 1) {
+ if (stats_mgr6_->getRcvdPacketsNum(StatsMgr6::XCHG_SA) == 1) {
first_packet_serverid_ = opt_serverid->getData();
}
pkt6->addOption(opt_serverid);
@@ -913,7 +1041,6 @@ TestControl::sendRequest6(const TestControlSocket& socket,
void
TestControl::sendSolicit6(const TestControlSocket& socket,
const bool preload /*= false*/) {
- ++sent_packets_0_;
last_sent_ = microsec_clock::universal_time();
// Generate the MAC address to be passed in the packet.
std::vector<uint8_t> mac_address = generateMacAddress();
@@ -988,6 +1115,15 @@ TestControl::setDefaults6(const TestControlSocket& socket,
pkt->setRemoteAddr(IOAddress(options.getServerName()));
}
+bool
+TestControl::testDiags(const char diag) const {
+ std::string diags(CommandOptions::instance().getDiags());
+ if (diags.find(diag) != std::string::npos) {
+ return true;
+ }
+ return false;
+}
+
void
TestControl::updateSendDue() {
// If default constructor was called, this should not happen but
@@ -1011,6 +1147,17 @@ TestControl::updateSendDue() {
}
// Calculate due time to initate next chunk of exchanges.
send_due_ = last_sent_ + time_duration(0, 0, 0, duration);
+ // Check if it is already due.
+ ptime now(microsec_clock::universal_time());
+ if (now > send_due_) {
+ if (testDiags('i')) {
+ if (options.getIpVersion() == 4) {
+ stats_mgr4_->incrementCounter("latesend");
+ } else if (options.getIpVersion() == 6) {
+ stats_mgr6_->incrementCounter("latesend");
+ }
+ }
+ }
}
diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h
index c94d7b6..9b634ce 100644
--- a/tests/tools/perfdhcp/test_control.h
+++ b/tests/tools/perfdhcp/test_control.h
@@ -552,6 +552,12 @@ protected:
void setDefaults6(const TestControlSocket& socket,
const dhcp::Pkt6Ptr& pkt);
+ /// \brief Find of diagnostic flag has been set.
+ ///
+ /// \param diag diagnostic flag (a,e,i,s,r,t,T).
+ /// \return true if diagnostics flag has been set.
+ bool testDiags(const char diag) const;
+
/// \brief Update due time to initiate next chunk of exchanges.
///
/// Method updates due time to initiate next chunk of exchanges.
@@ -561,6 +567,12 @@ protected:
private:
+ /// \brief Convert binary value to hex string.
+ ///
+ /// \param b byte to convert.
+ /// \return hex string.
+ std::string byte2Hex(const uint8_t b) const;
+
/// \brief Generate transaction id using random function.
///
/// \return generated transaction id value.
@@ -584,6 +596,26 @@ private:
/// \return number of sent packets.
uint64_t getSentPacketsNum(const ExchangeType xchg_type) const;
+ /// \brief Handle interrupt signal.
+ ///
+ /// Function sets flag indicating that program has been
+ /// interupted.
+ ///
+ /// \param sig signal (ignored)
+ static void handleInterrupt(int sig);
+
+ /// \brief Convert vector in hexadecimal string.
+ ///
+ /// \param vec vector to be converted.
+ /// \param separator separator.
+ std::string vector2Hex(const std::vector<uint8_t>& vec,
+ const std::string& separator = "") const;
+
+ /// \brief Print main diagnostics data.
+ ///
+ /// Method prints main diagnostics data.
+ void printDiagnostics() const;
+
boost::posix_time::ptime send_due_; ///< Due time to initiate next chunk
///< of exchanges.
boost::posix_time::ptime last_sent_; ///< Indicates when the last exchange
@@ -602,8 +634,7 @@ private:
/// Packet template buffers.
TemplateBufferList template_buffers_;
- uint64_t sent_packets_0_;
- uint64_t sent_packets_1_;
+ static bool interrupted_; ///< Is program interrupted.
};
} // namespace perfdhcp
diff --git a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
index 2233847..d6b3aef 100644
--- a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
+++ b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
@@ -387,13 +387,13 @@ TEST_F(StatsMgrTest, CustomCounters) {
// Increment one of the counters 10 times.
const uint64_t tooshort_num = 10;
for (uint64_t i = 0; i < tooshort_num; ++i) {
- stats_mgr->IncrementCounter(too_short_key);
+ stats_mgr->incrementCounter(too_short_key);
}
// Increment another counter by 5 times.
const uint64_t toolate_num = 5;
for (uint64_t i = 0; i < toolate_num; ++i) {
- stats_mgr->IncrementCounter(too_late_key);
+ stats_mgr->incrementCounter(too_late_key);
}
// Check counter's current value and name.
More information about the bind10-changes
mailing list