[roc] Extend CardFinder for single cards

Author: kostorr

CMakeLists.txt

@@ -63,7 +63,7 @@ if(NOT APPLE)
     set(boost_python_component "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
   else()
     # Backwards compatible. Can be removed once the Python3 recipe is stable
-    message(WARNING "Python 3 was not found: falling back to Python 3")
+    message(WARNING "Python 3 was not found: falling back to Python 2")
     find_package(Python2 2.7 COMPONENTS Development REQUIRED)
     set(boost_python_component "python27")
   endif()

include/ReadoutCard/CardFinder.h

@@ -17,13 +17,16 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CARDFINDER_H_
 
 #include "ReadoutCard/CardDescriptor.h"
+#include "ReadoutCard/Parameters.h"
 
 namespace AliceO2
 {
 namespace roc
 {
 
 std::vector<CardDescriptor> findCards(); //Possibly extend with card types (crorc, cru)
+CardDescriptor findCard(const std::string cardId);
+CardDescriptor findCard(const Parameters::CardIdType& cardId);
 
 } // namespace roc
 } // namespace AliceO2

include/ReadoutCard/Parameters.h

@@ -382,7 +382,7 @@ class Parameters
   /// \return Reference to this object for chaining calls
   auto setTimeFrameDetectionEnabled(TimeFrameDetectionEnabledType value) -> Parameters&;
 
-  // on-throwing getters
+  // non-throwing getters
 
   /// Gets the AllowRejection parameter
   /// \return The value wrapped in an optional if it is present, or an empty optional if it was not

src/CardFinder.cxx

@@ -27,5 +27,15 @@ std::vector<CardDescriptor> findCards()
   return cards;
 }
 
+CardDescriptor findCard(const std::string cardId)
+{
+  return RocPciDevice(roc::Parameters::cardIdFromString(cardId)).getCardDescriptor();
+}
+
+CardDescriptor findCard(const Parameters::CardIdType& cardId)
+{
+  return RocPciDevice(cardId).getCardDescriptor();
+}
+
 } // namespace roc
 } // namespace AliceO2

src/DmaChannelPdaBase.cxx

@@ -50,21 +50,22 @@ DmaChannelPdaBase::DmaChannelPdaBase(const Parameters& parameters,
   if (auto bufferParameters = parameters.getBufferParameters()) {
     // Create appropriate BufferProvider subclass
     auto bufferId = getPdaDmaBufferIndexPages(getChannelNumber(), 0);
-    mBufferProvider = Visitor::apply<std::unique_ptr<DmaBufferProviderInterface>>(*bufferParameters,
-                                                                                  [&](buffer_parameters::Memory parameters) {
-                                                                                    log("Initializing with DMA buffer from memory region", InfoLogger::InfoLogger::Debug);
-                                                                                    return std::make_unique<PdaDmaBufferProvider>(mRocPciDevice->getPciDevice(), parameters.address,
-                                                                                                                                  parameters.size, bufferId, true);
-                                                                                  },
-                                                                                  [&](buffer_parameters::File parameters) {
-                                                                                    log("Initializing with DMA buffer from memory-mapped file", InfoLogger::InfoLogger::Debug);
-                                                                                    return std::make_unique<FilePdaDmaBufferProvider>(mRocPciDevice->getPciDevice(), parameters.path,
-                                                                                                                                      parameters.size, bufferId, true);
-                                                                                  },
-                                                                                  [&](buffer_parameters::Null) {
-                                                                                    log("Initializing with null DMA buffer", InfoLogger::InfoLogger::Debug);
-                                                                                    return std::make_unique<NullDmaBufferProvider>();
-                                                                                  });
+    mBufferProvider = Visitor::apply<std::unique_ptr<DmaBufferProviderInterface>>(
+      *bufferParameters,
+      [&](buffer_parameters::Memory parameters) {
+        log("Initializing with DMA buffer from memory region", InfoLogger::InfoLogger::Debug);
+        return std::make_unique<PdaDmaBufferProvider>(mRocPciDevice->getPciDevice(), parameters.address,
+                                                      parameters.size, bufferId, true);
+      },
+      [&](buffer_parameters::File parameters) {
+        log("Initializing with DMA buffer from memory-mapped file", InfoLogger::InfoLogger::Debug);
+        return std::make_unique<FilePdaDmaBufferProvider>(mRocPciDevice->getPciDevice(), parameters.path,
+                                                          parameters.size, bufferId, true);
+      },
+      [&](buffer_parameters::Null) {
+        log("Initializing with null DMA buffer", InfoLogger::InfoLogger::Debug);
+        return std::make_unique<NullDmaBufferProvider>();
+      });
     //TODO: This can be simplified as only the
     //first case is used...
   } else {

src/Dummy/DummyDmaChannel.cxx

@@ -46,10 +46,11 @@ DummyDmaChannel::DummyDmaChannel(const Parameters& params)
 
   if (auto bufferParameters = params.getBufferParameters()) {
     // Create appropriate BufferProvider subclass
-    Visitor::apply(*bufferParameters,
-                   [&](buffer_parameters::Memory parameters) { mBufferSize = parameters.size; },
-                   [&](buffer_parameters::File parameters) { mBufferSize = parameters.size; },
-                   [&](buffer_parameters::Null) { mBufferSize = 0; });
+    Visitor::apply(
+      *bufferParameters,
+      [&](buffer_parameters::Memory parameters) { mBufferSize = parameters.size; },
+      [&](buffer_parameters::File parameters) { mBufferSize = parameters.size; },
+      [&](buffer_parameters::Null) { mBufferSize = 0; });
   } else {
     BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message("DmaChannel requires buffer_parameters"));
   }