[Core] Fix: proper destructors / rule of 5 for everything involving s…

…td::thread (#1334)
eclipse-ecal · Jan 26, 2024 · d528d42 · d528d42
1 parent c0d3b8f
commit d528d42
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/ecal/core/include/ecal/ecal_timed_cb.h b/ecal/core/include/ecal/ecal_timed_cb.h
@@ -97,7 +97,10 @@ namespace eCAL
     {
       if (!m_running) return(false);
       m_stop = true;
-      m_thread.join();
+      // Wait for the callback thread to finish
+      if (m_thread.joinable()) {
+        m_thread.join();
+      }
       m_running = false;
       return(true);
     }

diff --git a/ecal/core/src/ecal_thread.h b/ecal/core/src/ecal_thread.h
@@ -37,6 +37,11 @@ namespace eCAL
     CThread();
     virtual ~CThread();
 
+    CThread(const CThread&) = delete;
+    CThread& operator=(const CThread&) = delete;
+    CThread(CThread&& rhs) = delete;
+    CThread& operator=(CThread&& rhs) = delete;
+
     int Start(int period, std::function<int()> ext_caller_);
     int Stop();
     int Fire();

diff --git a/ecal/core/src/ecal_timer.cpp b/ecal/core/src/ecal_timer.cpp
@@ -38,6 +38,10 @@ namespace eCAL
     CTimerImpl(const int timeout_, TimerCallbackT callback_, const int delay_) : m_stop(false), m_running(false) { Start(timeout_, callback_, delay_); }
 
     virtual ~CTimerImpl() { Stop(); }
+    CTimerImpl(const CTimerImpl&) = delete;
+    CTimerImpl& operator=(const CTimerImpl&) = delete;
+    CTimerImpl(CTimerImpl&& rhs) = delete;
+    CTimerImpl& operator=(CTimerImpl&& rhs) = delete;
 
     bool Start(const int timeout_, TimerCallbackT callback_, const int delay_)
     {

diff --git a/ecal/core/src/io/ecal_memfile_pool.cpp b/ecal/core/src/io/ecal_memfile_pool.cpp
@@ -309,7 +309,10 @@ namespace eCAL
   {
   }
 
-  CMemFileThreadPool::~CMemFileThreadPool() = default;
+  CMemFileThreadPool::~CMemFileThreadPool()
+  {
+    Destroy();
+  }
 
   void CMemFileThreadPool::Create()
   {

diff --git a/ecal/core/src/io/ecal_memfile_pool.h b/ecal/core/src/io/ecal_memfile_pool.h
@@ -50,6 +50,11 @@ namespace eCAL
     CMemFileObserver();
     ~CMemFileObserver();
 
+    CMemFileObserver(const CMemFileObserver&) = delete;
+    CMemFileObserver& operator=(const CMemFileObserver&) = delete;
+    CMemFileObserver(CMemFileObserver&& rhs) = delete;
+    CMemFileObserver& operator=(CMemFileObserver&& rhs) = delete;
+
     bool Create(const std::string& memfile_name_, const std::string& memfile_event_);
     bool Destroy();