commit 0da1f44c7933d66349d050d971807bc00895b160
author Davide Pesavento <davidepesa@gmail.com> Fri Jul 26 17:38:13 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri Jul 26 19:06:36 2019 -0400
tree 92469461351ff7d8d88b5e4d16d1f359f23b0ce4
parent 6a1396e2e0fae85168593827795f8118c4ede029

chunks+peek+ping: use correct underlying type for time::milliseconds

Change-Id: I3f46f846401eccc0c11d3abcd1a5ebff89056f7d

tools/chunks/catchunks/main.cpp

diff --git a/tools/chunks/catchunks/main.cpp b/tools/chunks/catchunks/main.cpp
index 82d10c8..c7deb5c 100644
--- a/tools/chunks/catchunks/main.cpp
+++ b/tools/chunks/catchunks/main.cpp
@@ -58,7 +58,7 @@
        ignoreCongMarks(false), enableFastConv(false);
   int initCwnd(1), initSsthresh(std::numeric_limits<int>::max()), k(8);
   double aiStep(1.0), rtoAlpha(0.125), rtoBeta(0.25), aimdBeta(0.5), cubicBeta(0.7);
-  int64_t minRto(200), maxRto(60000);
+  time::milliseconds::rep minRto(200), maxRto(60000);
   std::string cwndPath, rttPath;
 
   namespace po = boost::program_options;
@@ -68,7 +68,7 @@
     ("pipeline-type,p", po::value<std::string>(&pipelineType)->default_value(pipelineType),
                         "type of Interest pipeline to use; valid values are: 'fixed', 'aimd', 'cubic'")
     ("fresh,f",     po::bool_switch(&options.mustBeFresh), "only return fresh content")
-    ("lifetime,l",  po::value<int64_t>()->default_value(options.interestLifetime.count()),
+    ("lifetime,l",  po::value<time::milliseconds::rep>()->default_value(options.interestLifetime.count()),
                     "lifetime of expressed Interests, in milliseconds")
     ("retries,r",   po::value<int>(&options.maxRetriesOnTimeoutOrNack)->default_value(options.maxRetriesOnTimeoutOrNack),
                     "maximum number of retries in case of Nack or timeout (-1 = no limit)")
@@ -107,10 +107,10 @@
                   "beta value for RTO calculation")
     ("rto-k",     po::value<int>(&k)->default_value(k),
                   "k value for RTO calculation")
-    ("min-rto",   po::value<int64_t>(&minRto)->default_value(minRto),
-                  "minimum RTO value in milliseconds")
-    ("max-rto",   po::value<int64_t>(&maxRto)->default_value(maxRto),
-                  "maximum RTO value in milliseconds")
+    ("min-rto",   po::value<time::milliseconds::rep>(&minRto)->default_value(minRto),
+                  "minimum RTO value, in milliseconds")
+    ("max-rto",   po::value<time::milliseconds::rep>(&maxRto)->default_value(maxRto),
+                  "maximum RTO value, in milliseconds")
     ("log-cwnd",  po::value<std::string>(&cwndPath), "log file for congestion window stats")
     ("log-rtt",   po::value<std::string>(&rttPath), "log file for round-trip time stats")
     ;
@@ -179,11 +179,11 @@
     return 2;
   }
 
-  if (vm["lifetime"].as<int64_t>() < 0) {
+  options.interestLifetime = time::milliseconds(vm["lifetime"].as<time::milliseconds::rep>());
+  if (options.interestLifetime < 0_ms) {
     std::cerr << "ERROR: lifetime cannot be negative" << std::endl;
     return 2;
   }
-  options.interestLifetime = time::milliseconds(vm["lifetime"].as<int64_t>());
 
   if (options.isQuiet && options.isVerbose) {
     std::cerr << "ERROR: cannot be quiet and verbose at the same time" << std::endl;