[283-perfdhcp-fix-send-due] Checkpoint: saved experiment diff

diff --git a/src/bin/perfdhcp/rate_control.cc b/src/bin/perfdhcp/rate_control.cc
index e6611287bd5a57cdeb722048fa5142f0e5515b10..ebdfe40c21149fb46297efcc90e9b57274b7c2e7 100644 (file)
--- a/src/bin/perfdhcp/rate_control.cc
+++ b/src/bin/perfdhcp/rate_control.cc
@@ -16,12 +16,14 @@ using namespace boost::posix_time;
 
 RateControl::RateControl()
     : send_due_(currentTime()), last_sent_(currentTime()),
-      aggressivity_(1), rate_(0), late_sent_(false) {
+      aggressivity_(1), rate_(0), late_sent_(false),
+      start_time_(currentTime()), sent_(0) {
 }
 
 RateControl::RateControl(const int rate, const int aggressivity)
     : send_due_(currentTime()), last_sent_(currentTime()),
-      aggressivity_(aggressivity), rate_(rate), late_sent_(false) {
+      aggressivity_(aggressivity), rate_(rate), late_sent_(false),
+      start_time_(currentTime()), sent_(0) {
     if (aggressivity_ < 1) {
         isc_throw(isc::BadValue, "invalid value of aggressivity "
                   << aggressivity << ", expected value is greater than 0");
@@ -100,18 +102,18 @@ RateControl::updateSendDue() {
         isc_throw(isc::Unexpected, "timestamp of the last sent packet not"
                   " initialized");
     }
-    // If rate was not specified we will wait just one clock tick to
-    // send next packet. This simulates best effort conditions.
-    long duration = 1;
-    if (getRate() != 0) {
-        // We use number of ticks instead of nanoseconds because
-        // nanosecond resolution may not be available on some
-        // machines. Number of ticks guarantees the highest possible
-        // timer resolution.
-        duration = time_duration::ticks_per_second() / getRate();
+    if (getRate() == 0) {
+       // If rate was not specified we will wait just one clock tick to
+       // send next packet. This simulates best effort conditions.
+       long duration = 1;
+       send_due_ = last_sent_ + time_duration(0, 0, 0, duration);
+    } else {
+       double offset = (double)(sent_ + 1) / (double)getRate();
+       boost::posix_time::time_duration duration =
+           microseconds((long)(offset * 1000000.));
+       send_due_ = start_time_ + duration;
     }
-    // Calculate due time to initiate next chunk of exchanges.
-    send_due_ = last_sent_ + time_duration(0, 0, 0, duration);
+
     if (send_due_ > currentTime()) {
         late_sent_ = true;
     } else {
@@ -147,6 +149,7 @@ RateControl::setRelativeDue(const int offset) {
 void
 RateControl::updateSendTime() {
     last_sent_ = currentTime();
+    ++sent_;
 }
 
 } // namespace perfdhcp

diff --git a/src/bin/perfdhcp/rate_control.h b/src/bin/perfdhcp/rate_control.h
index b1b8b723608e9a1e1c0054e708136bc19178d78b..d6caa8166b39403059e3ce67761a57b4fb495d70 100644 (file)
--- a/src/bin/perfdhcp/rate_control.h
+++ b/src/bin/perfdhcp/rate_control.h
@@ -164,6 +164,10 @@ protected:
     /// past.
     bool late_sent_;
 
+    boost::posix_time::ptime start_time_;
+
+    uint64_t sent_;
+
 };
 
 }