commit 92998fe2e15300a572f922496f0a062ee3c24aba
author Davide Pesavento <davide.pesavento@lip6.fr> Wed Jan 18 21:04:52 2017 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Jan 20 15:55:54 2017 -0500
tree 584ee20ba4dbcf35ad26c523f80f21d57d6af787
parent 716ab60f0575cf797ad2c7b375e8879f03726d41

chunks: respect common options in AIMD pipeline

Change-Id: Ic759950be9b6335efa2119c4cfbd22e3911b69ab

tools/chunks/catchunks/ndncatchunks.cpp

diff --git a/tools/chunks/catchunks/ndncatchunks.cpp b/tools/chunks/catchunks/ndncatchunks.cpp
index e123ade..38cb23b 100644
--- a/tools/chunks/catchunks/ndncatchunks.cpp
+++ b/tools/chunks/catchunks/ndncatchunks.cpp
@@ -1,8 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2016,  Regents of the University of California,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University.
+ * Copyright (c) 2016-2017, Regents of the University of California,
+ *                          Colorado State University,
+ *                          University Pierre & Marie Curie, Sorbonne University.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -231,8 +231,7 @@
 
       rttEstimator = make_unique<aimd::RttEstimator>(optionsRttEst);
 
-      PipelineInterestsAimd::Options optionsPipeline;
-      optionsPipeline.isVerbose = options.isVerbose;
+      PipelineInterestsAimd::Options optionsPipeline(options);
       optionsPipeline.disableCwa = disableCwa;
       optionsPipeline.resetCwndToInit = resetCwndToInit;
       optionsPipeline.initCwnd = static_cast<double>(initCwnd);

tools/chunks/catchunks/pipeline-interests-aimd.hpp

diff --git a/tools/chunks/catchunks/pipeline-interests-aimd.hpp b/tools/chunks/catchunks/pipeline-interests-aimd.hpp
index 1670fda..b51c59f 100644
--- a/tools/chunks/catchunks/pipeline-interests-aimd.hpp
+++ b/tools/chunks/catchunks/pipeline-interests-aimd.hpp
@@ -37,14 +37,21 @@
 namespace chunks {
 namespace aimd {
 
-struct PipelineInterestsAimdOptions : public Options
+class PipelineInterestsAimdOptions : public Options
 {
-  bool isVerbose = false;
+public:
+  explicit
+  PipelineInterestsAimdOptions(const Options& options = Options())
+    : Options(options)
+  {
+  }
+
+public:
   double initCwnd = 1.0; ///< initial congestion window size
-  double initSsthresh = std::numeric_limits<double>::max(); ///<  initial slow start threshold
+  double initSsthresh = std::numeric_limits<double>::max(); ///< initial slow start threshold
+  double aiStep = 1.0; ///< additive increase step (in segments)
   double mdCoef = 0.5; ///< multiplicative decrease coefficient
-  double aiStep = 1.0; ///< additive increase step (unit: segment)
-  time::milliseconds rtoCheckInterval = time::milliseconds(10); ///<  time interval for checking retransmission timer
+  time::milliseconds rtoCheckInterval{10}; ///< interval for checking retransmission timer
   bool disableCwa = false; ///< disable Conservative Window Adaptation
   bool resetCwndToInit = false; ///< reduce cwnd to initCwnd when loss event occurs
 };