Create InDataHandler only from the moment startThread() is called. This is safer, and might fix a segfault

cpp_src/device/lasp_indatahandler.cpp

@@ -5,7 +5,7 @@
 #include <thread>
 
 InDataHandler::InDataHandler(SmgrHandle mgr, const InCallbackType cb,
-                             const InResetType resetfcn)
+                             const ResetCallbackType resetfcn)
     : _mgr(mgr), inCallback(cb), reset(resetfcn)
 #if LASP_DEBUG == 1
       ,

cpp_src/device/lasp_indatahandler.h

@@ -22,7 +22,7 @@ using InCallbackType = std::function<void(const DaqData &)>;
 /**
  * @brief Function definition for the reset callback.
  */
-using InResetType = std::function<void(const Daq *)>;
+using ResetCallbackType = std::function<void(const Daq *)>;
 
 class InDataHandler {
 
@@ -38,7 +38,7 @@ protected:
 public:
   ~InDataHandler();
   const InCallbackType inCallback;
-  const InResetType reset;
+  const ResetCallbackType reset;
 
   /**
    * @brief When constructed, the handler is added to the stream manager, which
@@ -50,7 +50,7 @@ public:
    * changes state.
    */
   InDataHandler(SmgrHandle mgr, InCallbackType cb,
-                InResetType resetfcn);
+                ResetCallbackType resetfcn);
 
   /**
    * @brief Adds the current InDataHandler to the list of handlers in the

cpp_src/dsp/lasp_threadedindatahandler.cpp

@@ -1,13 +1,15 @@
 /* #define DEBUGTRACE_ENABLED */
 #include "lasp_threadedindatahandler.h"
-#include "debugtrace.hpp"
+
-#include "lasp_daqdata.h"
-#include "lasp_thread.h"
 #include <future>
 #include <optional>
 #include <queue>
 #include <thread>
 
+#include "debugtrace.hpp"
+#include "lasp_daqdata.h"
+#include "lasp_thread.h"
+
 using namespace std::literals::chrono_literals;
 using lck = std::scoped_lock<std::mutex>;
 using rte = std::runtime_error;
@@ -20,13 +22,13 @@ class SafeQueue {
   std::mutex _mtx;
   std::atomic<uint32_t> _contents{0};
 
-public:
+ public:
   void push(const DaqData &d) {
     DEBUGTRACE_ENTER;
     lck lock(_mtx);
     _queue.push(d);
     _contents++;
-	assert(_contents == _queue.size());
+    assert(_contents == _queue.size());
   }
   DaqData pop() {
     DEBUGTRACE_ENTER;
@@ -39,7 +41,7 @@ public:
     DaqData d(_queue.front());
     _queue.pop();
     _contents--;
-	assert(_contents == _queue.size());
+    assert(_contents == _queue.size());
     return d;
   }
   /**
@@ -52,32 +54,40 @@ public:
 };
 
 ThreadedInDataHandlerBase::ThreadedInDataHandlerBase(SmgrHandle mgr,
-                                             InCallbackType cb,
+                                                     InCallbackType cb,
-                                             InResetType reset)
+                                                     ResetCallbackType reset)
-    : _indatahandler(
+    : _queue(std::make_unique<SafeQueue>()),
-          mgr,
+      inCallback(cb),
-          std::bind(&ThreadedInDataHandlerBase::_inCallbackFromInDataHandler, this,
+      resetCallback(reset),
-                    _1),
+      _smgr(mgr) {
-          reset),
-      _queue(std::make_unique<SafeQueue>()), inCallback(cb) {
-
   DEBUGTRACE_ENTER;
-
 }
 void ThreadedInDataHandlerBase::startThread() {
   DEBUGTRACE_ENTER;
+  if (_indatahandler) {
+    throw rte("BUG: ThreadedIndataHandler already started");
+  }
+  SmgrHandle smgr = _smgr.lock();
+  if (!smgr) {
+    cerr << "Stream manager destructed" << endl;
+    return;
+  }
+  _indatahandler = std::make_unique<InDataHandler>(
+      smgr,
+      std::bind(&ThreadedInDataHandlerBase::_inCallbackFromInDataHandler, this,
+                _1),
+      resetCallback);
+
+  _indatahandler->start();
   _thread_can_safely_run = true;
-  _indatahandler.start();
 }
 
 void ThreadedInDataHandlerBase::_inCallbackFromInDataHandler(
     const DaqData &daqdata) {
   DEBUGTRACE_ENTER;
-  std::scoped_lock lck(_mtx);
 
   // Early return in case object is under DESTRUCTION
-  if (!_thread_can_safely_run)
+  if (!_thread_can_safely_run) return;
-    return;
 
   _queue->push(daqdata);
   if (!_thread_running) {
@@ -88,20 +98,25 @@ void ThreadedInDataHandlerBase::_inCallbackFromInDataHandler(
 
 void ThreadedInDataHandlerBase::stopThread() {
   DEBUGTRACE_ENTER;
-  // Make sure inCallback is no longer called
+  if(!_indatahandler) {
-  _thread_can_safely_run = false;
+    throw rte("BUG: ThreadedIndataHandler not running");
-  _indatahandler.stop();
+  }
 
-  std::scoped_lock lck(_mtx);
+  // Make sure no new data arrives
+  _indatahandler->stop();
+
+  // Stop the existing thread
+  _thread_can_safely_run = false;
 
   // Then wait in steps for the thread to stop running.
   while (_thread_running) {
     std::this_thread::sleep_for(10us);
   }
+  // Kill the handler
+  _indatahandler.reset();
 }
 
 ThreadedInDataHandlerBase::~ThreadedInDataHandlerBase() {
-
   DEBUGTRACE_ENTER;
   if (_thread_can_safely_run) {
     stopThread();
@@ -113,12 +128,10 @@ ThreadedInDataHandlerBase::~ThreadedInDataHandlerBase() {
 }
 
 void ThreadedInDataHandlerBase::threadFcn() {
-
   DEBUGTRACE_ENTER;
   _thread_running = true;
 
   while (!_queue->empty() && _thread_can_safely_run) {
-
     // Call inCallback_threaded
     inCallback(_queue->pop());
   }

cpp_src/dsp/lasp_threadedindatahandler.h

@@ -29,21 +29,27 @@ class ThreadedInDataHandlerBase {
    * @brief The queue used to push elements to the handling thread.
    */
 
-  InDataHandler _indatahandler;
   std::unique_ptr<SafeQueue> _queue;
 
-  mutable std::recursive_mutex _mtx;
-
-  std::atomic<bool> _thread_running{false};
-  std::atomic<bool> _thread_can_safely_run{false};
-
-  GlobalThreadPool _pool;
-
   /**
    * @brief Function pointer that is called when new DaqData arrives.
    */
   const InCallbackType inCallback;
 
+  /**
+   * @brief Function pointer that is called when reset() is called.
+   */
+  const ResetCallbackType resetCallback;
+
+  std::weak_ptr<StreamMgr> _smgr;
+  
+  std::unique_ptr<InDataHandler> _indatahandler;
+
+  std::atomic<bool> _thread_running{false};
+  std::atomic<bool> _thread_can_safely_run{false};
+
+  GlobalThreadPool _pool;
+
   void threadFcn();
 
 
@@ -58,7 +64,7 @@ class ThreadedInDataHandlerBase {
   void _inCallbackFromInDataHandler(const DaqData &daqdata);
 
   public:
-  ThreadedInDataHandlerBase(SmgrHandle mgr, InCallbackType cb, InResetType reset);
+  ThreadedInDataHandlerBase(SmgrHandle mgr, InCallbackType cb, ResetCallbackType reset);
   ~ThreadedInDataHandlerBase();
   /**
    * @brief This method should be called from the derived class' constructor,