commit 44b3b23ae65de94507e6593d9fd0f5bf8321659c
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Dec 23 16:58:25 2017 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Sat Dec 23 16:59:33 2017 -0500
tree 3db506003c54ea4f4effed02d86c467da5a95fd0
parent 2c3083dc774884878de2fdd858f90a35ea006125

chunks: respect --retries=-1 in AIMD pipeline

Change-Id: I72a88285500c5083e1a0a1ad32a317e92747d812
Refs: #4409

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

diff --git a/tools/chunks/catchunks/pipeline-interests-aimd.cpp b/tools/chunks/catchunks/pipeline-interests-aimd.cpp
index 61ed8f3..a63c9de 100644
--- a/tools/chunks/catchunks/pipeline-interests-aimd.cpp
+++ b/tools/chunks/catchunks/pipeline-interests-aimd.cpp
@@ -26,6 +26,7 @@
  */
 
 #include "pipeline-interests-aimd.hpp"
+#include "data-fetcher.hpp"
 
 #include <cmath>
 
@@ -134,7 +135,8 @@
     auto ret = m_retxCount.emplace(segNo, 1);
     if (ret.second == false) { // not the first retransmission
       m_retxCount[segNo] += 1;
-      if (m_retxCount[segNo] > m_options.maxRetriesOnTimeoutOrNack) {
+      if (m_options.maxRetriesOnTimeoutOrNack != DataFetcher::MAX_RETRIES_INFINITE &&
+          m_retxCount[segNo] > m_options.maxRetriesOnTimeoutOrNack) {
         return handleFail(segNo, "Reached the maximum number of retries (" +
                           to_string(m_options.maxRetriesOnTimeoutOrNack) +
                           ") while retrieving segment #" + to_string(segNo));
@@ -464,15 +466,16 @@
 std::ostream&
 operator<<(std::ostream& os, const PipelineInterestsAimdOptions& options)
 {
-  os << "PipelineInterestsAimd initial parameters:\n"
+  os << "AIMD pipeline parameters:\n"
      << "\tInitial congestion window size = " << options.initCwnd << "\n"
      << "\tInitial slow start threshold = " << options.initSsthresh << "\n"
      << "\tAdditive increase step = " << options.aiStep << "\n"
      << "\tMultiplicative decrease factor = " << options.mdCoef << "\n"
      << "\tRTO check interval = " << options.rtoCheckInterval << "\n"
-     << "\tMax retries on timeout or Nack = " << options.maxRetriesOnTimeoutOrNack << "\n"
+     << "\tMax retries on timeout or Nack = " << (options.maxRetriesOnTimeoutOrNack == DataFetcher::MAX_RETRIES_INFINITE ?
+                                                    "infinite" : to_string(options.maxRetriesOnTimeoutOrNack)) << "\n"
      << "\tReaction to congestion marks " << (options.ignoreCongMarks ? "disabled" : "enabled") << "\n"
-     << "\tConservative Window Adaptation " << (options.disableCwa ? "disabled" : "enabled") << "\n"
+     << "\tConservative window adaptation " << (options.disableCwa ? "disabled" : "enabled") << "\n"
      << "\tResetting cwnd to " << (options.resetCwndToInit ? "initCwnd" : "ssthresh") << " upon loss event\n";
   return os;
 }