Added Unit Tests, Increased Coverage, and Fixed Compilation and I/O Issues

CMakeLists.txt

@@ -77,12 +77,20 @@ daq_add_application(datahandlinglibs_test_bufferedfilereader test_bufferedfilere
 daq_add_application(datahandlinglibs_test_skiplist test_skiplist_app.cxx TEST LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
 daq_add_application(datahandlinglibs_test_composite_key test_composite_key_app.cxx TEST LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
 
+daq_add_application(datahandlinglibs_test_to_include_to_lcov_app test_to_include_to_lcov_app.cxx TEST LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+
 ##############################################################################
 # Unit Tests
 
-#daq_add_unit_test(datahandlinglibs_BufferedReadWrite_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_BufferedReadWrite_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
 #daq_add_unit_test(datahandlinglibs_VariableSizeElementQueue_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
 daq_add_unit_test(datahandlinglibs_DataMoveCallbackRegistry_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_ReadoutTypes_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_IterableQueueModel_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_SkiplistLatencyBufferModel_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_TaskRawDataProcessorModel_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_DefaultRequestHandlerModel_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
+daq_add_unit_test(datahandlinglibs_DataHandlingModel_test LINK_LIBRARIES datahandlinglibs ${BOOST_LIBS})
 
 ##############################################################################
 # Installation

include/datahandlinglibs/ReadoutTypes.hpp

@@ -1,5 +1,5 @@
 /**
- * @file ReadoutTypes.hpp Common types in datahandlinglibs
+ * @file ReadoutTypes.hpp Common types in datahandlinglibs, used for tests
  *
  * This is part of the DUNE DAQ , copyright 2020.
  * Licensing/copyright details are in the COPYING file that you should have

include/datahandlinglibs/concepts/RecorderConcept.hpp

@@ -26,7 +26,7 @@
 namespace dunedaq {
 namespace datahandlinglibs {
 
-class RecorderConcept
+class RecorderConcept : public opmonlib::MonitorableObject
 {
 public:
   RecorderConcept() {}

include/datahandlinglibs/models/IterableQueueModel.hpp

@@ -91,38 +91,6 @@ struct IterableQueueModel : public LatencyBufferConcept<T>
     , writeIndex_(0)
   {}
 
-  // Explicit constructor with size
-  explicit IterableQueueModel(std::size_t size) // size must be >= 2
-    : LatencyBufferConcept<T>() // NOLINT(build/unsigned)
-    , numa_aware_(false)
-    , numa_node_(0)
-    , intrinsic_allocator_(false)
-    , alignment_size_(0)
-    , invalid_configuration_requested_(false)
-    , prefill_ready_(false)
-    , prefill_done_(false)
-    , size_(size)
-    , records_(static_cast<T*>(std::malloc(sizeof(T) * size)))
-    , readIndex_(0)
-    , writeIndex_(0)
-  {
-    assert(size >= 2);
-    if (!records_) {
-      throw std::bad_alloc();
-    }
-#if 0
-    ptrlogger = std::thread([&](){
-      while(true) {
-        auto const currentRead = readIndex_.load(std::memory_order_relaxed);
-        auto const currentWrite = writeIndex_.load(std::memory_order_relaxed);
-        TLOG() << "BEG:" << std::hex << &records_[0] << " END:" << &records_[size] << std::dec
-                  << " R:" << currentRead << " - W:" << currentWrite
-                  << " OFLOW:" << overflow_ctr;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-      }
-    });
-#endif
-  }
 
   // Constructor with alignment strategies
   IterableQueueModel(std::size_t size, // size must be >= 2
@@ -218,7 +186,7 @@ struct IterableQueueModel : public LatencyBufferConcept<T>
   // Gives a pointer to the current read index
   const T* front() override;
 
-  // Gives a pointer to the current write index
+  // Gives a pointer to the last written element
   const T* back() override;
 
   // Gives a pointer to the first available slot of the queue

include/datahandlinglibs/models/detail/DefaultRequestHandlerModel.hxx

@@ -511,7 +511,7 @@ DefaultRequestHandlerModel<RDT, LBT>::get_fragment_pieces(uint64_t start_win_ts,
           }
         }
         else {
-	  //TLOG() << "Add element " << element->get_timestamp();      
+	        TLOG() << "Add element " << element->get_timestamp();      
           // We are somewhere in the middle -> the whole aggregated object (e.g.: superchunk) can be copied
           frag_pieces.emplace_back(
             std::make_pair<void*, size_t>(static_cast<void*>((*start_iter).begin()), element->get_payload_size()));

include/datahandlinglibs/models/detail/EmptyFragmentRequestHandlerModel.hxx

@@ -24,7 +24,7 @@ EmptyFragmentRequestHandlerModel<ReadoutType, LatencyBufferType>::issue_request(
                                 << fragment->get_element_id();
     //auto frag = std::make_pair(std::move(fragment), datarequest.data_destination);
     get_iom_sender<std::unique_ptr<daqdataformats::Fragment>>(datarequest.data_destination)
-      ->send(std::move(fragment), inherited::m_fragment_send_timeout_ms);
+      ->send(std::move(fragment), std::chrono::milliseconds(inherited::m_fragment_send_timeout_ms));
   } catch (const ers::Issue& excpt) {
     ers::warning(CannotWriteToQueue(
       ERS_HERE, DefaultRequestHandlerModel<ReadoutType, LatencyBufferType>::m_sourceid, "fragment queue", excpt));

include/datahandlinglibs/models/detail/IterableQueueModel.hxx

@@ -273,7 +273,7 @@ IterableQueueModel<T>::front()
   return &records_[currentRead];
 }
 
-// Gives a pointer to the current write index
+// Gives a pointer to the last written element
 template<class T>
 const T* 
 IterableQueueModel<T>::back()