BIND 10 trac3183, updated. 0d62790c36094e5789cdb7ff713e8e58ba9326fd [3183] Separate rate control for Renew messages.
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Oct 8 12:11:19 UTC 2013
The branch, trac3183 has been updated
via 0d62790c36094e5789cdb7ff713e8e58ba9326fd (commit)
from 235246a1c1aaf52a976896ab1bfc0df551abdb5a (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 0d62790c36094e5789cdb7ff713e8e58ba9326fd
Author: Marcin Siodelski <marcin at isc.org>
Date: Tue Oct 8 14:11:01 2013 +0200
[3183] Separate rate control for Renew messages.
-----------------------------------------------------------------------
Summary of changes:
tests/tools/perfdhcp/test_control.cc | 37 +++++++++++---------
tests/tools/perfdhcp/test_control.h | 22 ++++++++++--
.../tools/perfdhcp/tests/test_control_unittest.cc | 6 ++--
3 files changed, 44 insertions(+), 21 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc
index 398eade..211acf3 100644
--- a/tests/tools/perfdhcp/test_control.cc
+++ b/tests/tools/perfdhcp/test_control.cc
@@ -481,17 +481,18 @@ TestControl::getElapsedTime(const T& pkt1, const T& pkt2) {
uint64_t
-TestControl::getNextExchangesNum() const {
+TestControl::getNextExchangesNum(const boost::posix_time::ptime& send_due,
+ const int rate) {
CommandOptions& options = CommandOptions::instance();
// Get current time.
ptime now(microsec_clock::universal_time());
- if (now >= send_due_) {
+ if (now >= send_due) {
// Reset number of exchanges.
uint64_t due_exchanges = 0;
// If rate is specified from the command line we have to
// synchornize with it.
- if (options.getRate() != 0) {
- time_period period(send_due_, now);
+ if (rate != 0) {
+ time_period period(send_due, now);
time_duration duration = period.length();
// due_factor indicates the number of seconds that
// sending next chunk of packets will take.
@@ -500,7 +501,7 @@ TestControl::getNextExchangesNum() const {
due_factor += duration.total_seconds();
// Multiplying due_factor by expected rate gives the number
// of exchanges to be initiated.
- due_exchanges = static_cast<uint64_t>(due_factor * options.getRate());
+ due_exchanges = static_cast<uint64_t>(due_factor * rate);
// We want to make sure that at least one packet goes out.
if (due_exchanges == 0) {
due_exchanges = 1;
@@ -1203,6 +1204,8 @@ TestControl::reset() {
send_due_ = microsec_clock::universal_time();
last_sent_ = send_due_;
last_report_ = send_due_;
+ renew_due_ = send_due_;
+ last_renew_ = send_due_;
transid_gen_.reset();
// Actual generators will have to be set later on because we need to
// get command line parameters first.
@@ -1270,10 +1273,10 @@ TestControl::run() {
initializeStatsMgr();
for (;;) {
// Calculate send due based on when last exchange was initiated.
- updateSendDue();
+ updateSendDue(last_sent_, options.getRate(), send_due_);
// Calculate number of packets to be sent to stay
// catch up with rate.
- uint64_t packets_due = getNextExchangesNum();
+ uint64_t packets_due = getNextExchangesNum(send_due_, options.getRate());
if ((packets_due == 0) && testDiags('i')) {
if (options.getIpVersion() == 4) {
stats_mgr4_->incrementCounter("shortwait");
@@ -1296,12 +1299,13 @@ TestControl::run() {
// Initiate new DHCP packet exchanges.
sendPackets(socket, packets_due);
+ // If -f<renew-rate> option was specified we have to check how many
+ // Renew packets should be sent to catch up with a desired rate.
if ((options.getIpVersion() == 6) && (options.getRenewRate() != 0)) {
+ updateSendDue(last_renew_, options.getRenewRate(), renew_due_);
uint64_t renew_packets_due =
- packets_due * options.getRenewRate() / options.getRate();
- if (renew_packets_due == 0) {
- renew_packets_due = 1;
- }
+ getNextExchangesNum(renew_due_, options.getRenewRate());
+ // Send renew packets.
sendRenewPackets(socket, renew_packets_due);
}
@@ -1990,16 +1994,17 @@ TestControl::testDiags(const char diag) const {
}
void
-TestControl::updateSendDue() {
+TestControl::updateSendDue(const boost::posix_time::ptime& last_sent,
+ const int rate,
+ boost::posix_time::ptime& send_due) {
// If default constructor was called, this should not happen but
// if somebody has changed default constructor it is better to
// keep this check.
- if (last_sent_.is_not_a_date_time()) {
+ if (last_sent.is_not_a_date_time()) {
isc_throw(Unexpected, "time of last sent packet not initialized");
}
// Get the expected exchange rate.
CommandOptions& options = CommandOptions::instance();
- int rate = options.getRate();
// If rate was not specified we will wait just one clock tick to
// send next packet. This simulates best effort conditions.
long duration = 1;
@@ -2011,14 +2016,14 @@ TestControl::updateSendDue() {
duration = time_duration::ticks_per_second() / rate;
}
// Calculate due time to initiate next chunk of exchanges.
- send_due_ = last_sent_ + time_duration(0, 0, 0, duration);
+ send_due = last_sent + time_duration(0, 0, 0, duration);
// Check if it is already due.
ptime now(microsec_clock::universal_time());
// \todo verify if this condition is not too tight. In other words
// verify if this will not produce too many late sends.
// We might want to look at this once we are done implementing
// microsecond timeouts in IfaceMgr.
- if (now > send_due_) {
+ if (now > send_due) {
if (testDiags('i')) {
if (options.getIpVersion() == 4) {
stats_mgr4_->incrementCounter("latesend");
diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h
index 5a87ac4..2909132 100644
--- a/tests/tools/perfdhcp/test_control.h
+++ b/tests/tools/perfdhcp/test_control.h
@@ -466,8 +466,13 @@ protected:
/// is based on current time, due time calculated with
/// \ref updateSendDue function and expected rate.
///
+ /// \param send_due Due time to initiate next chunk set exchanges.
+ /// \param rate A rate at which exchanges are initiated.
+ ///
/// \return number of exchanges to be started immediately.
- uint64_t getNextExchangesNum() const;
+ static uint64_t
+ getNextExchangesNum(const boost::posix_time::ptime& send_due,
+ const int rate);
/// \brief Return template buffer.
///
@@ -878,7 +883,14 @@ protected:
/// Method updates due time to initiate next chunk of exchanges.
/// Function takes current time, last sent packet's time and
/// expected rate in its calculations.
- void updateSendDue();
+ ///
+ /// \param last_sent A time when the last exchange was initiated.
+ /// \param rate A rate at which exchangesa re initiated
+ /// \param [out] send_due A reference to the time object to be updated
+ /// with the next due time.
+ void updateSendDue(const boost::posix_time::ptime& last_sent,
+ const int rate,
+ boost::posix_time::ptime& send_due);
private:
@@ -1026,7 +1038,11 @@ private:
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
- /// was initiated.
+ ///< was initiated.
+ boost::posix_time::ptime renew_due_; ///< Due time to send next set of
+ ///< Renew requests.
+ boost::posix_time::ptime last_renew_; ///< Indicates when the last Renew
+ ///< was sent.
boost::posix_time::ptime last_report_; ///< Last intermediate report time.
diff --git a/tests/tools/perfdhcp/tests/test_control_unittest.cc b/tests/tools/perfdhcp/tests/test_control_unittest.cc
index a6260ba..114ec68 100644
--- a/tests/tools/perfdhcp/tests/test_control_unittest.cc
+++ b/tests/tools/perfdhcp/tests/test_control_unittest.cc
@@ -1234,7 +1234,8 @@ TEST_F(TestControlTest, RateControl) {
CommandOptions& options = CommandOptions::instance();
NakedTestControl tc1;
- uint64_t xchgs_num = tc1.getNextExchangesNum();
+ uint64_t xchgs_num = tc1.getNextExchangesNum(microsec_clock::universal_time(),
+ options.getRate());
EXPECT_EQ(options.getAggressivity(), xchgs_num);
// The exchange rate is now 1 per second. We don't know how many
@@ -1245,7 +1246,8 @@ TEST_F(TestControlTest, RateControl) {
processCmdLine("perfdhcp -l 127.0.0.1 -a 1000000 -r 1 all")
);
NakedTestControl tc2;
- xchgs_num = tc2.getNextExchangesNum();
+ xchgs_num = tc2.getNextExchangesNum(microsec_clock::universal_time(),
+ options.getRate());
EXPECT_GT(xchgs_num, 0);
EXPECT_LT(xchgs_num, options.getAggressivity());
// @todo add more thorough checks for rate values.
More information about the bind10-changes
mailing list