From 69cf59f32dd8edf10b11ba98816e3d8bdffcee45 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 19 Jul 2022 11:13:15 +0200
Subject: [PATCH] Stop USRP write thread if necessary

---
 targets/ARCH/COMMON/common_lib.h             |  2 ++
 targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index 0f11447bf4..3434e40c87 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -310,6 +310,8 @@ typedef struct {
   pthread_cond_t cond_write;
   /// mutex for trx write thread
   pthread_mutex_t mutex_write;
+  /// to inform the thread to exit
+  bool write_thread_exit;
 } openair0_thread_t;
 
 /*!\brief structure holds the parameters to configure USRP devices */
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 281066a881..93b3c72189 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -309,6 +309,9 @@ static int trx_usrp_start(openair0_device *device) {
 
   return 0;
 }
+
+static void trx_usrp_write_reset(openair0_thread_t *wt);
+
 /*! \brief Terminate operation of the USRP transceiver -- free all associated resources
  * \param device the hardware to use
  */
@@ -322,6 +325,8 @@ static void trx_usrp_end(openair0_device *device) {
   iqrecorder_end(device);
 
   LOG_I(HW, "releasing USRP\n");
+  if (usrp_tx_thread != 0)
+    trx_usrp_write_reset(&device->write_thread);
 
   s->tx_stream->~tx_streamer();
   s->rx_stream->~rx_streamer();
@@ -518,6 +523,8 @@ void *trx_usrp_write_thread(void * arg){
     while (write_thread->count_write == 0) {
       pthread_cond_wait(&write_thread->cond_write,&write_thread->mutex_write); // this unlocks mutex_rxtx while waiting and then locks it again
     }
+    if (write_thread->write_thread_exit)
+      break;
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_THREAD, 1 );
     s = (usrp_state_t *)device->priv;
     start = write_thread->start;
@@ -612,6 +619,7 @@ int trx_usrp_write_init(openair0_device *device){
   write_thread->start              = 0;
   write_thread->end                = 0;
   write_thread->count_write        = 0;
+  write_thread->write_thread_exit  = false;
   printf("end of tx write thread\n");
   pthread_mutex_init(&write_thread->mutex_write, NULL);
   pthread_cond_init(&write_thread->cond_write, NULL);
@@ -620,6 +628,17 @@ int trx_usrp_write_init(openair0_device *device){
   return(0);
 }
 
+static void trx_usrp_write_reset(openair0_thread_t *wt) {
+  pthread_mutex_lock(&wt->mutex_write);
+  wt->count_write = 1;
+  wt->write_thread_exit = true;
+  pthread_mutex_unlock(&wt->mutex_write);
+  pthread_cond_signal(&wt->cond_write);
+  void *retval = NULL;
+  pthread_join(wt->pthread_write, &retval);
+  LOG_I(HW, "stopped USRP write thread\n");
+}
+
 //---------------------end-------------------------
 
 /*! \brief Receive samples from hardware.