[Core] Race Conditions: Make CRegistrationReceiver m_callback_custom_…

…apply_sample threadsafe.

Co-authored-by: Rex Schilasky <[email protected]>

ecal/core/src/registration/ecal_registration_receiver.cpp

@@ -43,6 +43,14 @@ namespace eCAL
   // CMemfileRegistrationReceiver
   //////////////////////////////////////////////////////////////////
 
+  CMemfileRegistrationReceiver::CMemfileRegistrationReceiver() 
+  = default;
+
+  CMemfileRegistrationReceiver::~CMemfileRegistrationReceiver()
+  {
+    Destroy();
+  }
+
   void CMemfileRegistrationReceiver::Create(eCAL::CMemoryFileBroadcastReader* memfile_broadcast_reader_)
   {
     if (m_created) return;
@@ -190,7 +198,11 @@ namespace eCAL
     eCAL::pb::Sample modified_ttype_sample;
     ModifyIncomingSampleForBackwardsCompatibility(ecal_sample_, modified_ttype_sample);
 
-    m_callback_custom_apply_sample(modified_ttype_sample);
+    // forward all registration samples to outside "customer" (e.g. Monitoring)
+    {
+      const std::lock_guard<std::mutex> lock(m_callback_custom_apply_sample_mtx);
+      m_callback_custom_apply_sample(modified_ttype_sample);
+    }
 
     std::string reg_sample;
     if ( m_callback_pub
@@ -405,11 +417,13 @@ namespace eCAL
 
   void CRegistrationReceiver::SetCustomApplySampleCallback(const ApplySampleCallbackT& callback_)
   {
+    const std::lock_guard<std::mutex> lock(m_callback_custom_apply_sample_mtx);
     m_callback_custom_apply_sample = callback_;
   }
 
   void CRegistrationReceiver::RemCustomApplySampleCallback()
   {
+    const std::lock_guard<std::mutex> lock(m_callback_custom_apply_sample_mtx);
     m_callback_custom_apply_sample = [](const auto&){};
   }
 }

ecal/core/src/registration/ecal_registration_receiver.h

@@ -38,6 +38,7 @@
 
 #include <atomic>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <thread>
 
@@ -54,13 +55,25 @@ namespace eCAL
   class CMemfileRegistrationReceiver
   {
   public:
+    CMemfileRegistrationReceiver();
+    ~CMemfileRegistrationReceiver();
+
+    // default copy constructor
+    CMemfileRegistrationReceiver(const CMemfileRegistrationReceiver& other) = delete;
+    // default copy assignment operator
+    CMemfileRegistrationReceiver& operator=(const CMemfileRegistrationReceiver& other) = delete;
+    // default move constructor
+    CMemfileRegistrationReceiver(CMemfileRegistrationReceiver&& other) noexcept = delete;
+    // default move assignment operator
+    CMemfileRegistrationReceiver& operator=(CMemfileRegistrationReceiver&& other) noexcept = delete;
+
     void Create(CMemoryFileBroadcastReader* memfile_broadcast_reader_);
     void Destroy();
 
   private:
     void Receive();
 
-    CMemoryFileBroadcastReader*      m_memfile_broadcast_reader = nullptr;
+    CMemoryFileBroadcastReader*       m_memfile_broadcast_reader = nullptr;
     std::shared_ptr<CCallbackThread>  m_memfile_broadcast_reader_thread;
 
     bool m_created = false;
@@ -115,6 +128,7 @@ namespace eCAL
     bool                                  m_use_network_monitoring;
     bool                                  m_use_shm_monitoring;
 
+    std::mutex                            m_callback_custom_apply_sample_mtx;
     ApplySampleCallbackT                  m_callback_custom_apply_sample;
 
     std::string                           m_host_group_name;