Update roc-bar-stress and roc-metrics with --id flag

Author: kostorr

CMakeLists.txt

@@ -195,25 +195,25 @@ set(EXE_NAMES
 
 if(PDA_FOUND)
   list(APPEND EXE_SRCS
-    #ProgramBarStress.cxx
+    ProgramBarStress.cxx
     ProgramConfig.cxx
     ProgramCleanup.cxx
     ../Example.cxx
     ProgramFlash.cxx
     ProgramFlashRead.cxx
     ProgramListCards.cxx
-    #ProgramMetrics.cxx
+    ProgramMetrics.cxx
     ProgramStatus.cxx
   )
   list(APPEND EXE_NAMES
-    #roc-bar-stress
+    roc-bar-stress
     roc-config
     roc-channel-cleanup
     roc-example
     roc-flash
     roc-flash-read
     roc-list-cards
-    #roc-metrics
+    roc-metrics
     roc-status
   )
 

include/ReadoutCard/ParameterTypes/PciAddress.h

@@ -6,6 +6,7 @@
 #ifndef ALICEO2_READOUTCARD_INCLUDE_PCIADDRESS_H_
 #define ALICEO2_READOUTCARD_INCLUDE_PCIADDRESS_H_
 
+#include <iostream>
 #include <string>
 #include <boost/optional.hpp>
 
@@ -40,6 +41,8 @@ class PciAddress
       return (bus == other.bus) && (slot == other.slot) && (function == other.function);
     }
 
+    friend std::ostream& operator<<(std::ostream& os, const PciAddress& pciAddress);
+
     /// Gets the bus number of this address
     /// \return Integer from 0 to 255 (0xff)
     int getBus() const

include/ReadoutCard/ParameterTypes/PciSequenceNumber.h

@@ -6,6 +6,7 @@
 #ifndef ALICEO2_READOUTCARD_INCLUDE_PCISEQUENCENUMBER_H_
 #define ALICEO2_READOUTCARD_INCLUDE_PCISEQUENCENUMBER_H_
 
+#include <iostream>
 #include <string>
 #include <boost/optional.hpp>
 
@@ -25,18 +26,23 @@ class PciSequenceNumber
     /// For example: "#04"
     static boost::optional<PciSequenceNumber> fromString(std::string string);
 
+    std::string toString() const;
+
     bool operator==(const int& other) const
     {
       return mSequenceNumber == other;
     }
-
+  
     bool operator==(const PciSequenceNumber& other) const
     {
       return mSequenceNumber == other.mSequenceNumber;
     }
- 
+
+    friend std::ostream& operator<<(std::ostream& os, const PciSequenceNumber& pciSequenceNumber);
+
   private:
     int mSequenceNumber;
+    std::string mSequenceNumberString;
 };
 
 } // namespace roc

src/CommandLineUtilities/ProgramBarStress.cxx

@@ -27,15 +27,12 @@ class ProgramBarStress: public Program
   virtual Description getDescription()
   {
     return {"Bar Stress", "Stress the Bar Accessor", 
-      "roc-bar-stress --pci-address 42:00.0 --gbt-link 0 --cycles 100000 --print-freq 10000 --errorcheck"};
+      "roc-bar-stress --id 42:00.0 --gbt-link 0 --cycles 100000 --print-freq 10000 --errorcheck"};
   }
 
   virtual void addOptions(boost::program_options::options_description& options)
   {
     options.add_options()
-      ("pci-address",
-       po::value<std::string>(&mOptions.pciAddress)->default_value("-1"),
-       "Card's PCI Address")
       ("gbt-link",
        po::value<uint32_t>(&mOptions.gbtLink)->default_value(0),
        "GBT link over which the bar writes will be performed. CRU is 0-17")
@@ -48,6 +45,7 @@ class ProgramBarStress: public Program
       ("errorcheck",
        po::bool_switch(&mOptions.errorCheck),
        "Perform data validation");
+    Options::addOptionCardId(options);
   }
 
   int stress(Swt *swt, long long cycles, long long printFrequency, bool errorCheck) 
@@ -107,7 +105,9 @@ class ProgramBarStress: public Program
   virtual void run(const boost::program_options::variables_map& map) 
   {
 
-    getLogger() << "PCI Address: " << mOptions.pciAddress << InfoLogger::endm;
+    auto cardId = Options::getOptionCardId(map);
+
+    getLogger() << "Card ID: " << cardId << InfoLogger::endm;
     getLogger() << "GBT Link: " << mOptions.gbtLink << InfoLogger::endm;
     getLogger() << "Cycles of SWT write(/read) operations: " << mOptions.cycles << InfoLogger::endm;
     getLogger() << "Print frequency: " << mOptions.printFrequency << InfoLogger::endm;
@@ -121,11 +121,10 @@ class ProgramBarStress: public Program
     getLogger() << "Logging time every " << barOps << " bar operations, of which:" << InfoLogger::endm;
     getLogger() << "barWrites: " << barWrites << " | barReads: " << barReads << InfoLogger::endm;
 
-
     std::shared_ptr<BarInterface>
-      bar0 = ChannelFactory().getBar(mOptions.pciAddress, 0);
+      bar0 = ChannelFactory().getBar(cardId, 0);
     std::shared_ptr<BarInterface>
-      bar2 = ChannelFactory().getBar(mOptions.pciAddress, 2);  
+      bar2 = ChannelFactory().getBar(cardId, 2);  
 
     if(isVerbose())
       getLogger() << "Resetting card..." << InfoLogger::endm;
@@ -153,7 +152,6 @@ class ProgramBarStress: public Program
 
   struct OptionsStruct 
   {
-    std::string pciAddress = "-1";
     uint32_t gbtLink = 0;
     long long cycles = 100;
     long long printFrequency = 10;

src/CommandLineUtilities/ProgramMetrics.cxx

@@ -25,27 +25,35 @@ class ProgramMetrics: public Program
   {
     return {"Metrics", "Return current RoC parameters", 
       "roc-metrics\n"
-      "roc-metrics --pci-address 42:00.0\n"};
+      "roc-metrics --id 42:00.0\n"};
   }
 
   virtual void addOptions(boost::program_options::options_description& options)
   {
-    options.add_options()
-      ("pci-address",
-       po::value<std::string>(&mOptions.pciAddress)->default_value("-1"),
-       "Card's PCI Address");
+    Options::addOptionCardId(options);
   }
 
   virtual void run(const boost::program_options::variables_map& map) 
   {
 
+    auto cardId = Options::getOptionCardId(map);
+
     std::vector<CardDescriptor> cardsFound;
-    if (mOptions.pciAddress != "-1")
-      cardsFound = RocPciDevice::findSystemDevices(mOptions.pciAddress);
-    else
-      cardsFound = RocPciDevice::findSystemDevices();
-      
 
+    if (auto serial = boost::get<int>(&cardId)) {
+      if (*serial == -1) {
+        cardsFound = RocPciDevice::findSystemDevices();
+      } else {
+        cardsFound = RocPciDevice::findSystemDevices(*serial);
+      }
+    } else if (auto pciAddress = boost::get<PciAddress>(&cardId)) {
+      cardsFound = RocPciDevice::findSystemDevices(*pciAddress); 
+    } else if (auto pciSequenceNumber = boost::get<PciSequenceNumber>(&cardId)) {
+      cardsFound = RocPciDevice::findSystemDevices(*pciSequenceNumber);
+    } else {
+      std::cout << "Something went wrong parsing the card id" << std::endl;
+    }
+    
     std::ostringstream table;
 
     auto formatHeader = "  %-3s %-6s %-10s %-10s %-19s %-20s %-19s %-8s %-17s %-17s\n";
@@ -82,19 +90,10 @@ class ProgramMetrics: public Program
     std::cout << table.str();
   }
 
-  struct OptionsStruct 
-  {
-    std::string pciAddress = "-1";
-  }mOptions;
-
   private:
 };
 
 int main(int argc, char** argv)
 {
-  if (argc > 2){
-    std::cout << "Too many arguments" << std::endl;
-    return -1;
-  }
   return ProgramMetrics().execute(argc, argv);
 }

src/ParameterTypes/PciAddress.cxx

@@ -73,5 +73,11 @@ boost::optional<PciAddress> PciAddress::fromString(std::string string)
   }
 }
 
+std::ostream& operator<<(std::ostream& os, const PciAddress& pciAddress)
+{
+  os << pciAddress.toString();
+  return os;
+}
+
 } // namespace roc
 } // namespace AliceO2

src/ParameterTypes/PciSequenceNumber.cxx

@@ -13,10 +13,9 @@ namespace roc {
 namespace {
 
   int parseSequenceNumberString(const std::string& string) {
-    std::regex expression ("^#[0-9]+$");
+    std::regex expression ("^[ \t]*#[0-9]+[ \t]*$");
     if (std::regex_search(string, expression)) {
-      std::string retString = string;
-      return stoi(retString.erase(0, 1)); //remove initial #
+      return stoi(string.substr(string.find('#') + 1));
     } else {
       BOOST_THROW_EXCEPTION(ParseException()
           << ErrorInfo::Message("Parsing PCI sequence number failed"));
@@ -27,9 +26,15 @@ namespace {
 
 PciSequenceNumber::PciSequenceNumber(const std::string& string)
 {
+  mSequenceNumberString = string;
   mSequenceNumber = parseSequenceNumberString(string);
 }
 
+std::string PciSequenceNumber::toString() const
+{
+  return mSequenceNumberString;
+}
+
 boost::optional<PciSequenceNumber> PciSequenceNumber::fromString(std::string string)
 {
   try {
@@ -40,5 +45,11 @@ boost::optional<PciSequenceNumber> PciSequenceNumber::fromString(std::string str
   }
 }
 
+std::ostream& operator<<(std::ostream& os, const PciSequenceNumber& pciSequenceNumber)
+{
+  os << pciSequenceNumber.toString();
+  return os;
+}
+
 } // namespace roc
 } // namespace AliceO2