JCF: account for new datahandlinglibs package as described in DUNE-DA…

…Q/daq-release#379
DUNE-DAQ · Jun 25, 2024 · f6ea90a · f6ea90a
1 parent 48c2c2d
commit f6ea90a
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(logging REQUIRED)
 find_package(daqdataformats REQUIRED)
 find_package(detdataformats REQUIRED)
 find_package(fddetdataformats REQUIRED)
-find_package(readoutlibs REQUIRED)
+find_package(datahandlinglibs REQUIRED)
 find_package(fdreadoutlibs REQUIRED)
 find_package(opmonlib REQUIRED)
 find_package(PkgConfig REQUIRED)
@@ -29,7 +29,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
 
 ##############################################################################
 # Dependency sets
-set(DUNEDAQ_DEPENDENCIES readoutlibs::readoutlibs daqdataformats::daqdataformats detdataformats::detdataformats fddetdataformats::fddetdataformats fdreadoutlibs::fdreadoutlibs)
+set(DUNEDAQ_DEPENDENCIES datahandlinglibs::datahandlinglibs daqdataformats::daqdataformats detdataformats::detdataformats fddetdataformats::fddetdataformats fdreadoutlibs::fdreadoutlibs)
 
 # Provide override functionality for DPDK dependencies
 option(WITH_DPDK_AS_PACKAGE "DPDK externals as a dunedaq package" OFF)

diff --git a/plugins/DPDKReaderModule.cpp b/plugins/DPDKReaderModule.cpp
@@ -21,8 +21,8 @@
 
 #include "logging/Logging.hpp"
 
-#include "readoutlibs/ReadoutIssues.hpp"
-#include "readoutlibs/utils/BufferCopy.hpp" 
+#include "datahandlinglibs/DataHandlingIssues.hpp"
+#include "datahandlinglibs/utils/BufferCopy.hpp" 
 
 #include "dpdklibs/EALSetup.hpp"
 #include "dpdklibs/RTEIfaceSetup.hpp"
@@ -96,15 +96,15 @@ DPDKReaderModule::init(const std::shared_ptr<appfwk::ModuleConfiguration> mcfg )
  auto mdal = mcfg->module<appmodel::DataReaderModule>(get_name());
  m_cfg = mcfg;
  if (mdal->get_outputs().empty()) {
-	auto err = dunedaq::readoutlibs::InitializationError(ERS_HERE, "No outputs defined for NIC reader in configuration.");
+	auto err = dunedaq::datahandlinglibs::InitializationError(ERS_HERE, "No outputs defined for NIC reader in configuration.");
   ers::fatal(err);
 	throw err;
  }
 
  for (auto con : mdal->get_outputs()) {
   auto queue = con->cast<confmodel::QueueWithSourceId>();
   if(queue == nullptr) {
-	  auto err = dunedaq::readoutlibs::InitializationError(ERS_HERE, "Outputs are not of type QueueWithGeoId.");
+	  auto err = dunedaq::datahandlinglibs::InitializationError(ERS_HERE, "Outputs are not of type QueueWithGeoId.");
 	  ers::fatal(err);
 	  throw err;
   }
@@ -152,7 +152,7 @@ DPDKReaderModule::do_configure(const data_t& /*args*/)
   for (auto res : res_set) {
     auto connection = res->cast<confmodel::DetectorToDaqConnection>();
     if (connection == nullptr) {
-      dunedaq::readoutlibs::GenericConfigurationError err(
+      dunedaq::datahandlinglibs::GenericConfigurationError err(
           ERS_HERE, "DetectorToDaqConnection configuration failed due expected but unavailable connection!"
         );
       ers::fatal(err);
@@ -166,7 +166,7 @@ DPDKReaderModule::do_configure(const data_t& /*args*/)
 
     auto receiver = connection->get_receiver()->cast<appmodel::DPDKReceiver>();
     if (!receiver) {
-      throw dunedaq::readoutlibs::InitializationError(
+      throw dunedaq::datahandlinglibs::InitializationError(
         ERS_HERE, fmt::format("Found {} of type {} in connection {} while expecting type DPDKReceiver", receiver->class_name(), receiver->UID(), connection->UID())
       );
     }
@@ -217,7 +217,7 @@ DPDKReaderModule::do_configure(const data_t& /*args*/)
     for ( auto sender : d2d_conn->get_senders() ) {
       auto nw_sender = sender->cast<appmodel::NWDetDataSender>();
       if ( !nw_sender ) {
-        throw dunedaq::readoutlibs::InitializationError(
+        throw dunedaq::datahandlinglibs::InitializationError(
           ERS_HERE, fmt::format("Found {} of type {} in connection {} while expecting type NWDetDataSender", dpdk_receiver->class_name(), dpdk_receiver->UID(), d2d_conn->UID())
         );
       }
@@ -232,7 +232,7 @@ DPDKReaderModule::do_configure(const data_t& /*args*/)
 
     if ((m_mac_to_id_map.count(net_device->get_mac_address()) == 0) || (m_pci_to_id_map.count(net_device->get_pcie_addr()) == 0)) {
         TLOG() << "No available interface with MAC=" << net_device->get_mac_address();
-        throw dunedaq::readoutlibs::InitializationError(
+        throw dunedaq::datahandlinglibs::InitializationError(
           ERS_HERE, "DPDKReaderModule configuration failed due expected but unavailable interface!"
         );
     }

diff --git a/plugins/DPDKReaderModule.hpp b/plugins/DPDKReaderModule.hpp
@@ -19,7 +19,7 @@
 #include "iomanager/IOManager.hpp"
 #include "iomanager/Sender.hpp"
 
-#include "readoutlibs/utils/ReusableThread.hpp"
+#include "datahandlinglibs/utils/ReusableThread.hpp"
 
 //#include "dpdklibs/nicreader/Structs.hpp"
 //#include "dpdklibs/nicreaderinfo/InfoNljs.hpp"

diff --git a/plugins/NICSender.cpp b/plugins/NICSender.cpp
@@ -29,7 +29,7 @@
 #include "dpdklibs/udp/PacketCtor.hpp"
 #include "fddetdataformats/TDE16Frame.hpp"
 
-#include "readoutlibs/utils/RateLimiter.hpp"
+#include "datahandlinglibs/utils/RateLimiter.hpp"
 
 /**
  * @brief Name used by TRACE TLOG calls from this source file
@@ -197,7 +197,7 @@ int lcore_main(void *arg)
   struct rte_mbuf **pkt = (rte_mbuf**) malloc(sizeof(struct rte_mbuf*) * m_burst_size);
   rte_pktmbuf_alloc_bulk(mbuf_pool, pkt, m_burst_size);
 
-  readoutlibs::RateLimiter rl(1.0 / 2.290);
+  datahandlinglibs::RateLimiter rl(1.0 / 2.290);
 
   std::random_device rd;
   std::default_random_engine rng(rd());

diff --git a/python/dpdklibs/reader_confgen.py b/python/dpdklibs/reader_confgen.py
@@ -9,15 +9,15 @@
 
 moo.otypes.load_types("dpdklibs/nicreader.jsonnet")
 
-moo.otypes.load_types("readoutlibs/sourceemulatorconfig.jsonnet")
-moo.otypes.load_types("readoutlibs/readoutconfig.jsonnet")
-moo.otypes.load_types("readoutlibs/recorderconfig.jsonnet")
+moo.otypes.load_types("datahandlinglibs/sourceemulatorconfig.jsonnet")
+moo.otypes.load_types("datahandlinglibs/readoutconfig.jsonnet")
+moo.otypes.load_types("datahandlinglibs/recorderconfig.jsonnet")
 
 # Import new types
 import dunedaq.dpdklibs.nicreader as nrc
-import dunedaq.readoutlibs.sourceemulatorconfig as sec
-import dunedaq.readoutlibs.readoutconfig as rconf
-import dunedaq.readoutlibs.recorderconfig as bfs
+import dunedaq.datahandlinglibs.sourceemulatorconfig as sec
+import dunedaq.datahandlinglibs.readoutconfig as rconf
+import dunedaq.datahandlinglibs.recorderconfig as bfs
 
 from daqconf.core.app import App, ModuleGraph
 from daqconf.core.daqmodule import DAQModule
@@ -83,7 +83,7 @@ def generate_dpdk_reader_app(
             queues += [Queue(f"datahandler_{idx}.tp_out",f"sw_tp_handler_{idx}.raw_input",f"sw_tp_link_{idx}",100000 )]                
 
         modules += [DAQModule(name=f"datahandler_{source_id}", plugin="DataLinkHandler", conf=rconf.Conf(
-                    readoutmodelconf=rconf.ReadoutModelConf(
+                    readoutmodelconf=rconf.DataHandlingModelConf(
                         source_queue_timeout_ms=QUEUE_POP_WAIT_MS,
                         fake_trigger_flag=1,
                         # source_id =link.dro_source_id,

diff --git a/src/CreateSource.hpp b/src/CreateSource.hpp
@@ -10,7 +10,7 @@
 
 #include "SourceConcept.hpp"
 #include "SourceModel.hpp"
-#include "readoutlibs/ReadoutIssues.hpp"
+#include "datahandlinglibs/DataHandlingIssues.hpp"
 
 #include "fdreadoutlibs/DUNEWIBEthTypeAdapter.hpp"
 #include "fdreadoutlibs/TDEFrameTypeAdapter.hpp"
@@ -30,7 +30,7 @@ createSourceModel(const std::string& conn_uid, bool callback_mode)
 {
   auto datatypes = dunedaq::iomanager::IOManager::get()->get_datatypes(conn_uid);
   if (datatypes.size() != 1) {
-    ers::error(dunedaq::readoutlibs::GenericConfigurationError(ERS_HERE,
+    ers::error(dunedaq::datahandlinglibs::GenericConfigurationError(ERS_HERE,
       "Multiple output data types specified! Expected only a single type!"));
   }
   std::string raw_dt{ *datatypes.begin() };

diff --git a/src/IfaceWrapper.cpp b/src/IfaceWrapper.cpp
@@ -6,7 +6,7 @@
  * received with this code.
  */
 #include "logging/Logging.hpp"
-#include "readoutlibs/ReadoutIssues.hpp"
+#include "datahandlinglibs/DataHandlingIssues.hpp"
 
 #include "dpdklibs/Issues.hpp"
 
@@ -231,7 +231,7 @@ IfaceWrapper::setup_flow_steering()
         TLOG() << "Flow can't be created for " << rxqid
          << " Error type: " << (unsigned)error.type
          << " Message: " << error.message;
-        ers::fatal(dunedaq::readoutlibs::InitializationError(
+        ers::fatal(dunedaq::datahandlinglibs::InitializationError(
           ERS_HERE, "Couldn't create Flow API rules!"));
         rte_exit(EXIT_FAILURE, "error in creating flow");
       }

diff --git a/src/SourceModel.hpp b/src/SourceModel.hpp
@@ -15,8 +15,8 @@
 #include "iomanager/Sender.hpp"
 #include "logging/Logging.hpp"
 
-// #include "readoutlibs/utils/ReusableThread.hpp"
-#include "readoutlibs/DataMoveCallbackRegistry.hpp"
+// #include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "datahandlinglibs/DataMoveCallbackRegistry.hpp"
 
 // #include <folly/ProducerConsumerQueue.h>
 // #include <nlohmann/json.hpp>
@@ -70,7 +70,7 @@ class SourceModel : public SourceConcept
         TLOG_DEBUG(5) << "SourceModel callback is already acquired!";
       } else {
         // Getting DataMoveCBRegistry
-        auto dmcbr = readoutlibs::DataMoveCallbackRegistry::get();
+        auto dmcbr = datahandlinglibs::DataMoveCallbackRegistry::get();
         m_sink_callback = dmcbr->get_callback<TargetPayloadType>(inherited::m_sink_name);
         m_callback_is_acquired = true;
       }
@@ -102,7 +102,7 @@ class SourceModel : public SourceConcept
     } else {
       TargetPayloadType target_payload;
       uint32_t bytes_copied = 0;
-      readoutlibs::buffer_copy(message, size, static_cast<void*>(&target_payload), bytes_copied, sizeof(target_payload));
+      datahandlinglibs::buffer_copy(message, size, static_cast<void*>(&target_payload), bytes_copied, sizeof(target_payload));
     }
 
     return true;

diff --git a/src/udp/Utils.cpp b/src/udp/Utils.cpp
@@ -9,7 +9,7 @@
 
 #include "detdataformats/DAQEthHeader.hpp"
 #include "logging/Logging.hpp"
-#include "readoutlibs/ReadoutIssues.hpp"
+#include "datahandlinglibs/DataHandlingIssues.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -174,7 +174,7 @@ add_file_contents_to_vector(const std::string& filename, std::vector<char>& buff
   packetfile.open(filename, std::ios::binary);
 
   if (!packetfile) {
-    throw ::dunedaq::readoutlibs::CannotOpenFile(ERS_HERE, filename);
+    throw ::dunedaq::datahandlinglibs::CannotOpenFile(ERS_HERE, filename);
   }
 
   while (packetfile.get(byte)) {