Validate generator and loopback mode pair of values

Author: kostorr

src/Cru/CruDmaChannel.h

@@ -126,37 +126,37 @@ class CruDmaChannel final : public DmaChannelPdaBase
     // These variables are configuration parameters
 
     /// Reset level on initialization of channel
-    ResetLevel::type mInitialResetLevel;
+    const ResetLevel::type mInitialResetLevel;
 
     /// Gives the type of loopback
-    LoopbackMode::type mLoopbackMode;
+    const LoopbackMode::type mLoopbackMode;
 
     /// Enables the data generator
-    bool mGeneratorEnabled;
+    const bool mGeneratorEnabled;
 
     /// Data pattern for the data generator
-    GeneratorPattern::type mGeneratorPattern;
+    const GeneratorPattern::type mGeneratorPattern;
 
     /// Random data size
-    bool mGeneratorDataSizeRandomEnabled;
+    const bool mGeneratorDataSizeRandomEnabled;
 
     /// Maximum number of events
-    int mGeneratorMaximumEvents;
+    const int mGeneratorMaximumEvents;
 
     /// Initial value of the first data in a data block
-    uint32_t mGeneratorInitialValue;
+    const uint32_t mGeneratorInitialValue;
 
     /// Sets the second word of each fragment when the data generator is used
-    uint32_t mGeneratorInitialWord;
+    const uint32_t mGeneratorInitialWord;
 
     /// Random seed parameter in case the data generator is set to produce random data
-    int mGeneratorSeed;
+    const int mGeneratorSeed;
 
     /// Length of data written to each page
-    size_t mGeneratorDataSize;
+    const size_t mGeneratorDataSize;
 };
 
 } // namespace roc
 } // namespace AliceO2
 
-#endif // ALICEO2_READOUTCARD_CRU_CRUDMACHANNEL_H_
+#endif // ALICEO2_READOUTCARD_CRU_CRUDMACHANNEL_H_

src/DmaChannelBase.cxx

@@ -13,18 +13,6 @@
 
 namespace AliceO2 {
 namespace roc {
-namespace {
-void checkParameters(const Parameters& parameters)
-{
-  // Generator enabled is not allowed in conjunction with none loopback mode
-  auto enabled = parameters.getGeneratorEnabled();
-  auto loopback = parameters.getGeneratorLoopback();
-  if (enabled && loopback && (*enabled && (*loopback == LoopbackMode::None))) {
-    BOOST_THROW_EXCEPTION(
-        InvalidParameterException() << ErrorInfo::Message("Generator enabled but 'None' loopback mode specified"));
-  }
-}
-} // Anonymous namespace
 
 namespace b = boost;
 namespace bfs = boost::filesystem;
@@ -42,7 +30,25 @@ void DmaChannelBase::checkChannelNumber(const AllowedChannels& allowedChannels)
   }
 }
 
-DmaChannelBase::DmaChannelBase(CardDescriptor cardDescriptor, const Parameters& parameters,
+void DmaChannelBase::checkParameters(Parameters& parameters)
+{
+  // Generator enabled is not allowed in conjunction with none loopback mode: default to Internal
+  auto enabled = parameters.getGeneratorEnabled();
+  auto loopback = parameters.getGeneratorLoopback();
+  if (enabled && loopback && (*enabled && (*loopback == LoopbackMode::None))) {
+    log("Generator enabled, defaulting to LoopbackMode = Internal", InfoLogger::InfoLogger::Debug);
+    parameters.setGeneratorLoopback(LoopbackMode::Internal);
+  }
+
+  // Generator disabled. Loopback mode should be set to None
+  if (enabled && loopback && (!*enabled && (*loopback != LoopbackMode::None))){
+    log("Generator disabled, defaulting to LoopbackMode = None", InfoLogger::InfoLogger::Debug);
+    parameters.setGeneratorLoopback(LoopbackMode::None);
+  }
+}
+
+
+DmaChannelBase::DmaChannelBase(CardDescriptor cardDescriptor, Parameters& parameters,
     const AllowedChannels& allowedChannels)
     : mCardDescriptor(cardDescriptor), mChannelNumber(parameters.getChannelNumberRequired())
 {

src/DmaChannelBase.h

@@ -36,7 +36,7 @@ class DmaChannelBase: public DmaChannelInterface
     /// \param cardDescriptor Card descriptor
     /// \param parameters Parameters of the channel
     /// \param allowedChannels Channels allowed by this card type
-    DmaChannelBase(CardDescriptor cardDescriptor, const Parameters& parameters,
+    DmaChannelBase(CardDescriptor cardDescriptor, Parameters& parameters,
         const AllowedChannels& allowedChannels);
     virtual ~DmaChannelBase();
 
@@ -109,6 +109,9 @@ class DmaChannelBase: public DmaChannelInterface
     /// Check if the channel number is valid
     void checkChannelNumber(const AllowedChannels& allowedChannels);
 
+    /// Check the validity of basic parameters
+    void checkParameters(Parameters& parameters);
+
     /// Type of the card
     const CardDescriptor mCardDescriptor;
 
@@ -128,4 +131,4 @@ class DmaChannelBase: public DmaChannelInterface
 } // namespace roc
 } // namespace AliceO2
 
-#endif // ALICEO2_SRC_READOUTCARD_DMACHANNELBASE_H_
+#endif // ALICEO2_SRC_READOUTCARD_DMACHANNELBASE_H_

src/DmaChannelPdaBase.cxx

@@ -30,7 +30,7 @@ CardDescriptor createCardDescriptor(const Parameters& parameters)
 
 DmaChannelPdaBase::DmaChannelPdaBase(const Parameters& parameters,
     const AllowedChannels& allowedChannels)
-    : DmaChannelBase(createCardDescriptor(parameters), parameters, allowedChannels), mDmaState(DmaState::STOPPED)
+    : DmaChannelBase(createCardDescriptor(parameters), const_cast<Parameters&>(parameters), allowedChannels), mDmaState(DmaState::STOPPED)
 {
   // Initialize PDA & DMA objects
   Utilities::resetSmartPtr(mRocPciDevice, getCardDescriptor().pciAddress);

src/Dummy/DummyDmaChannel.cxx

@@ -24,7 +24,7 @@ constexpr size_t READY_QUEUE_SIZE = 32;
 constexpr auto endm = InfoLogger::InfoLogger::StreamOps::endm;
 
 DummyDmaChannel::DummyDmaChannel(const Parameters& params)
-    : DmaChannelBase(makeDummyDescriptor(), params, { 0, 1, 2, 3, 4, 5, 6, 7 }),
+    : DmaChannelBase(makeDummyDescriptor(), const_cast<Parameters&>(params), { 0, 1, 2, 3, 4, 5, 6, 7 }),
       mTransferQueue(TRANSFER_QUEUE_SIZE), mReadyQueue(READY_QUEUE_SIZE)
 {
   getLogger() << "DummyDmaChannel::DummyDmaChannel(channel:" << params.getChannelNumberRequired() << ")"