Merge pull request #40 from DUNE-DAQ/johnfreeman/ReusableThreadFromUt…

…ilities Reapply "Use ReusableThread from the utilities package"
DUNE-DAQ · Feb 5, 2025 · db91458 · db91458
2 parents 455843b + 1503af3
commit db91458
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 140 deletions.
diff --git a/include/datahandlinglibs/FakeCardReaderBase.hpp b/include/datahandlinglibs/FakeCardReaderBase.hpp
@@ -26,7 +26,7 @@
 
 #include "appfwk/ModuleConfiguration.hpp"
 
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 #include "datahandlinglibs/utils/FileSourceBuffer.hpp"
 
 #include "nlohmann/json.hpp"

diff --git a/include/datahandlinglibs/concepts/RecorderConcept.hpp b/include/datahandlinglibs/concepts/RecorderConcept.hpp
@@ -12,7 +12,7 @@
 #include "datahandlinglibs/ReadoutTypes.hpp"
 //#include "datahandlinglibs/recorderconfig/Structs.hpp"
 #include "datahandlinglibs/utils/BufferedFileWriter.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 #include "appmodel/DataRecorderModule.hpp"
 
 #include <atomic>

diff --git a/include/datahandlinglibs/models/DataHandlingModel.hpp b/include/datahandlinglibs/models/DataHandlingModel.hpp
@@ -43,7 +43,7 @@
 #include "datahandlinglibs/concepts/RequestHandlerConcept.hpp"
 
 #include "datahandlinglibs/DataHandlingIssues.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include <functional>
 #include <memory>
@@ -176,7 +176,7 @@ class DataHandlingModel : public DataHandlingConcept
   std::atomic<int> m_num_payloads_overwritten{ 0 };
 
   // CONSUMER
-  ReusableThread m_consumer_thread;
+  utilities::ReusableThread m_consumer_thread;
 
   // RAW RECEIVER
   std::chrono::milliseconds m_raw_receiver_timeout_ms;
@@ -197,7 +197,7 @@ class DataHandlingModel : public DataHandlingConcept
   // TIME-SYNC
   using timesync_sender_ct = iomanager::SenderConcept<dfmessages::TimeSync>; // no timeout -> published
   std::shared_ptr<timesync_sender_ct> m_timesync_sender;
-  ReusableThread m_timesync_thread;
+  utilities::ReusableThread m_timesync_thread;
   std::string m_timesync_connection_name;
   uint32_t m_pid_of_current_process;
 

diff --git a/include/datahandlinglibs/models/DataSubscriberModel.hpp b/include/datahandlinglibs/models/DataSubscriberModel.hpp
@@ -15,7 +15,7 @@
 #include "iomanager/Sender.hpp"
 #include "iomanager/Receiver.hpp"
 #include "logging/Logging.hpp"
-//#include "datahandlinglibs/utils/ReusableThread.hpp"
+//#include "utilities/ReusableThread.hpp"
 
 #include "confmodel/Connection.hpp"
 

diff --git a/include/datahandlinglibs/models/DefaultRequestHandlerModel.hpp b/include/datahandlinglibs/models/DefaultRequestHandlerModel.hpp
@@ -12,7 +12,7 @@
 #include "datahandlinglibs/DataHandlingIssues.hpp"
 #include "datahandlinglibs/concepts/RequestHandlerConcept.hpp"
 #include "datahandlinglibs/utils/BufferedFileWriter.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include "datahandlinglibs/opmon/datahandling_info.pb.h"
 
@@ -227,10 +227,10 @@ class DefaultRequestHandlerModel : public RequestHandlerConcept<ReadoutType, Lat
 
   // Data recording
   BufferedFileWriter<> m_buffered_writer;
-  ReusableThread m_recording_thread;
+  utilities::ReusableThread m_recording_thread;
 
-  ReusableThread m_cleanup_thread;
-  ReusableThread m_periodic_transmission_thread;
+  utilities::ReusableThread m_cleanup_thread;
+  utilities::ReusableThread m_periodic_transmission_thread;
 
   // Bookkeeping of OOB requests
   std::map<dfmessages::DataRequest, int> m_request_counter;

diff --git a/include/datahandlinglibs/models/RecorderModel.hpp b/include/datahandlinglibs/models/RecorderModel.hpp
@@ -14,7 +14,7 @@
 #include "datahandlinglibs/ReadoutTypes.hpp"
 #include "datahandlinglibs/concepts/RecorderConcept.hpp"
 #include "datahandlinglibs/utils/BufferedFileWriter.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include "datahandlinglibs/opmon/datahandling_info.pb.h"
 
@@ -68,7 +68,7 @@ class RecorderModel : public RecorderConcept
   BufferedFileWriter<> m_buffered_writer;
 
   // Threading
-  ReusableThread m_work_thread;
+  utilities::ReusableThread m_work_thread;
   std::atomic<bool> m_run_marker;
 
   // Stats

diff --git a/include/datahandlinglibs/models/SourceEmulatorModel.hpp b/include/datahandlinglibs/models/SourceEmulatorModel.hpp
@@ -21,7 +21,7 @@
 #include "datahandlinglibs/utils/ErrorBitGenerator.hpp"
 #include "datahandlinglibs/utils/FileSourceBuffer.hpp"
 #include "datahandlinglibs/utils/RateLimiter.hpp"
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include "datahandlinglibs/opmon/datahandling_info.pb.h"
 
@@ -140,7 +140,7 @@ class SourceEmulatorModel : public SourceEmulatorConcept
   std::unique_ptr<FileSourceBuffer> m_file_source;
   ErrorBitGenerator m_error_bit_generator;
 
-  ReusableThread m_producer_thread;
+  utilities::ReusableThread m_producer_thread;
 
   std::string m_name;
   bool m_is_configured = false;

diff --git a/include/datahandlinglibs/models/TaskRawDataProcessorModel.hpp b/include/datahandlinglibs/models/TaskRawDataProcessorModel.hpp
@@ -24,7 +24,7 @@
 #include "appmodel/DataHandlerConf.hpp"
 #include "appmodel/DataProcessor.hpp"
 
-#include "datahandlinglibs/utils/ReusableThread.hpp"
+#include "utilities/ReusableThread.hpp"
 
 #include <folly/ProducerConsumerQueue.h>
 
@@ -113,7 +113,7 @@ class TaskRawDataProcessorModel : public RawDataProcessorConcept<ReadoutType>
   // Post-processing functions and their corresponding threads
   std::vector<std::function<void(const ReadoutType*)>> m_post_process_functions;
   std::vector<std::unique_ptr<folly::ProducerConsumerQueue<const ReadoutType*>>> m_items_to_postprocess_queues;
-  std::vector<std::unique_ptr<ReusableThread>> m_post_process_threads;
+  std::vector<std::unique_ptr<utilities::ReusableThread>> m_post_process_threads;
 
   // Internals
   size_t m_postprocess_queue_sizes;

diff --git a/include/datahandlinglibs/models/detail/TaskRawDataProcessorModel.hxx b/include/datahandlinglibs/models/detail/TaskRawDataProcessorModel.hxx
@@ -80,7 +80,7 @@ template<typename Task>
 void 
 TaskRawDataProcessorModel<ReadoutType>::add_postprocess_task(Task&& task)
 {
-  m_post_process_threads.emplace_back(std::make_unique<ReusableThread>(0));
+  m_post_process_threads.emplace_back(std::make_unique<utilities::ReusableThread>(0));
   m_post_process_functions.push_back(std::forward<Task>(task));
 }
 

diff --git a/include/datahandlinglibs/utils/ReusableThread.hpp b/include/datahandlinglibs/utils/ReusableThread.hpp