Merge pull request #147 from DUNE-DAQ/johnfreeman/ReusableThreadFromU…

…tilities Johnfreeman/reusable thread from utilities
DUNE-DAQ · Feb 5, 2025 · c2759b6 · c2759b6
2 parents 8f339bb + 7ff9856
commit c2759b6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,12 +12,13 @@ find_package(datahandlinglibs REQUIRED)
 find_package(fdreadoutlibs REQUIRED)
 find_package(felix REQUIRED)
 find_package(opmonlib REQUIRED)
+find_package(utilities REQUIRED)
 find_package(folly)
 
 
 ##############################################################################
 # Dependency sets
-set(DUNEDAQ_DEPENDENCIES appfwk::appfwk datahandlinglibs::datahandlinglibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel)
+set(DUNEDAQ_DEPENDENCIES appfwk::appfwk datahandlinglibs::datahandlinglibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel utilities::utilities)
 
 # Provide override functionality for FELIX dependencies
 option(WITH_FELIX_AS_PACKAGE "FELIX externals as a dunedaq package" ON)

diff --git a/cmake/flxlibsConfig.cmake.in b/cmake/flxlibsConfig.cmake.in
@@ -10,6 +10,7 @@ find_dependency(datahandlinglibs)
 find_dependency(fdreadoutlibs)
 find_dependency(felix)
 find_dependency(opmonlib)
+find_dependency(utilities)
 find_dependency(folly)
 
 if (EXISTS ${CMAKE_SOURCE_DIR}/@PROJECT_NAME@)

diff --git a/src/CardWrapper.hpp b/src/CardWrapper.hpp
@@ -12,7 +12,7 @@
 //#include "flxlibs/felixcardreader/Structs.hpp"
 
 #include "appmodel/FelixInterface.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include "flxcard/FlxCard.h"
 #include "packetformat/block_format.hpp"
@@ -107,7 +107,7 @@ class CardWrapper
   // Processor
   inline static const std::string m_dma_processor_name = "flx-dma";
   std::atomic<bool> m_run_lock;
-  datahandlinglibs::ReusableThread m_dma_processor;
+  utilities::ReusableThread m_dma_processor;
   std::function<void(uint64_t)> m_handle_block_addr; // NOLINT
   bool m_block_addr_handler_available{ false };
   void process_DMA();

diff --git a/src/ElinkModel.hpp b/src/ElinkModel.hpp
@@ -18,7 +18,7 @@
 #include "iomanager/IOManager.hpp"
 #include "iomanager/Sender.hpp"
 #include "logging/Logging.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include <folly/ProducerConsumerQueue.h>
 #include <nlohmann/json.hpp>
@@ -190,7 +190,7 @@ class ElinkModel : public ElinkConcept
 
   // Processor
   inline static const std::string m_parser_thread_name = "elinkp";
-  datahandlinglibs::ReusableThread m_parser_thread;
+  utilities::ReusableThread m_parser_thread;
   void process_elink()
   {
     while (m_run_marker.load()) {