Merge pull request #103 from NordicSemiconductor/fix/state-check-and-…

…cleanup-transports

Fix transport cleanup and check if state machine thread exists

src/common/transport/h5_transport.cpp

@@ -652,6 +652,11 @@ void H5Transport::startStateMachine()
  {
  stateMachineThread = new std::thread(std::bind(&H5Transport::stateMachineWorker, this));
  }
+ else
+ {
+ // Terminate if the state machine already exists, this should not happen.
+ std::terminate();
+ }
 }
 
 void H5Transport::stopStateMachine()

src/common/transport/serialization_transport.cpp

@@ -95,10 +95,8 @@ uint32_t SerializationTransport::open(status_cb_t status_callback, evt_cb_t even
 
 uint32_t SerializationTransport::close()
 {
- eventMutex.lock();
  runEventThread = false;
- eventWaitCondition.notify_one();
- eventMutex.unlock();
+ eventWaitCondition.notify_all();
 
  if (eventThread != nullptr)
  {

src/common/transport/uart_boost.cpp

@@ -64,10 +64,6 @@ UartBoost::UartBoost(const UartCommunicationParameters &communicationParameters)
 
 UartBoost::~UartBoost()
 {
- UartBoost::close();
- workNotifier.~work();
- ioWorkThread.join();
- ioService.stop();
 }
 
 uint32_t UartBoost::open(status_cb_t status_callback, data_cb_t data_callback, log_cb_t log_callback)
@@ -174,6 +170,7 @@ uint32_t UartBoost::close()
 {
  try
  {
+ serialPort.cancel();
  serialPort.close();
  ioService.stop();
  ioWorkThread.join();