[status] Add option to specify links reported

Author: kostorr

src/CommandLineUtilities/ProgramStatus.cxx

@@ -58,6 +58,9 @@ class ProgramStatus : public Program
     options.add_options()("onu-status",
                           po::bool_switch(&mOptions.onu),
                           "Toggle ONU status output");
+    options.add_options()("links",
+                          po::value<std::string>(&mOptions.links)->default_value("0-11"),
+                          "Links to show (all by default)");
   }
 
   virtual void run(const boost::program_options::variables_map& map)
@@ -95,6 +98,7 @@ class ProgramStatus : public Program
       }
 
       auto params = Parameters::makeParameters(cardId, 0); //status available on BAR0
+      params.setLinkMask(Parameters::linkMaskFromString(mOptions.links));
       auto bar0 = ChannelFactory().getBar(params);
       auto crorcBar0 = std::dynamic_pointer_cast<CrorcBar>(bar0);
 
@@ -175,6 +179,7 @@ class ProgramStatus : public Program
       lineThin = std::string(header.length(), '-') + '\n';
 
       auto params = Parameters::makeParameters(cardId, 2); //status available on BAR2
+      params.setLinkMask(Parameters::linkMaskFromString(mOptions.links));
       auto bar2 = ChannelFactory().getBar(params);
       auto cruBar2 = std::dynamic_pointer_cast<CruBar>(bar2);
 
@@ -400,6 +405,7 @@ class ProgramStatus : public Program
 
  private:
   struct OptionsStruct {
+    std::string links = "0-11";
     bool jsonOut = false;
     bool monitoring = false;
     bool onu = false;

src/Crorc/CrorcBar.cxx

@@ -37,6 +37,7 @@ CrorcBar::CrorcBar(const Parameters& parameters, std::unique_ptr<RocPciDevice> r
   : BarInterfaceBase(parameters, std::move(rocPciDevice)),
     mCrorcId(parameters.getCrorcId().get_value_or(0x0)),
     mDynamicOffset(parameters.getDynamicOffsetEnabled().get_value_or(false)),
+    mLinkMask(parameters.getLinkMask().get_value_or(std::set<uint32_t>{ 0, 1, 2, 3, 4, 5 })),
     mTimeFrameLength(parameters.getTimeFrameLength().get_value_or(0x100)),
     mTimeFrameDetectionEnabled(parameters.getTimeFrameDetectionEnabled().get_value_or(true))
 {
@@ -131,6 +132,17 @@ void CrorcBar::configure(bool /*force*/)
 Crorc::ReportInfo CrorcBar::report()
 {
   std::map<int, Crorc::Link> linkMap = initializeLinkMap();
+
+  // strip down link map, depending on link(s) requested to report on
+  // "associative-container erase idiom"
+  for (auto it = linkMap.cbegin(); it != linkMap.cend(); /* no increment */) {
+    if ((mLinkMask.find(it->first) == mLinkMask.end())) {
+      linkMap.erase(it++);
+    } else {
+      it++;
+    }
+  }
+
   getOpticalPowers(linkMap);
   Crorc::ReportInfo reportInfo = {
     linkMap,

src/Crorc/CrorcBar.h

@@ -94,6 +94,7 @@ class CrorcBar final : public BarInterfaceBase
 
   uint16_t mCrorcId;
   bool mDynamicOffset;
+  std::set<uint32_t> mLinkMask;
   uint16_t mTimeFrameLength;
   bool mTimeFrameDetectionEnabled;
 };

src/Cru/CruBar.cxx

@@ -459,6 +459,16 @@ Cru::ReportInfo CruBar::report()
 {
   std::map<int, Link> linkMap = initializeLinkMap();
 
+  // strip down link map, depending on link(s) requested to report on
+  // "associative-container erase idiom"
+  for (auto it = linkMap.cbegin(); it != linkMap.cend(); /* no increment */) {
+    if ((mLinkMask.find(it->first) == mLinkMask.end())) {
+      linkMap.erase(it++);
+    } else {
+      it++;
+    }
+  }
+
   bool gbtEnabled = false;
   // Update linkMap
   Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount, mEndpoint);

test/TestParameters.cxx

@@ -68,6 +68,10 @@ BOOST_AUTO_TEST_CASE(ParametersLinkMaskFromString)
     BOOST_CHECK(Parameters::linkMaskFromString("0,1,4-6") == b);
     BOOST_CHECK(Parameters::linkMaskFromString("0-1,4-6") == b);
   }
+  {
+    auto c = Parameters::LinkMaskType{ 0, 3, 4, 5 };
+    BOOST_CHECK(Parameters::linkMaskFromString("0,3-5") == c);
+  }
   BOOST_CHECK_THROW(Parameters::linkMaskFromString("0/2/3/4"), ParseException);
   BOOST_CHECK_THROW(Parameters::linkMaskFromString("0,1,2,3+4"), ParseException);
 }