summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-03-29 11:59:27 -0700
committerJosh Blum <josh@joshknows.com>2012-03-29 16:01:52 -0700
commit7ac203b39c126c4bdb9b2f5494052fd9eea8f21b (patch)
tree40e0613df526ff96623113e36c802275f1dbffb4
parent3e8e9dad3c2bdd5e7151956ba9b87142d2cb1435 (diff)
downloaduhd-7ac203b39c126c4bdb9b2f5494052fd9eea8f21b.tar.gz
uhd-7ac203b39c126c4bdb9b2f5494052fd9eea8f21b.tar.bz2
uhd-7ac203b39c126c4bdb9b2f5494052fd9eea8f21b.zip
usrp1: stop threads in deconstructor
Its important to stop the threads before we let the other smart point objects naturally deconstruct to avoid thread-based race conditions. The attempt to deconstruct the tree and soft time ctrl had a bug because the tree had references in subtrees within the dboard manager class. Rather than continue to fix this method and deconstruct the tree to free up soft time ctrl, it seems simpler to just stop the thread in soft time ctrl, and then let it naturally deconstruct later by ref count.
-rw-r--r--host/lib/usrp/usrp1/soft_time_ctrl.cpp6
-rw-r--r--host/lib/usrp/usrp1/soft_time_ctrl.hpp5
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.cpp3
3 files changed, 10 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index 90b3a92da..65bdc36d4 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2011 Ettus Research LLC
+// Copyright 2011-2012 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -207,6 +207,10 @@ public:
return _inline_msg_queue;
}
+ void stop(void){
+ _recv_cmd_task.reset();
+ }
+
private:
boost::mutex _update_mutex;
size_t _nsamps_remaining;
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.hpp b/host/lib/usrp/usrp1/soft_time_ctrl.hpp
index b92b51252..f418ec35a 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.hpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.hpp
@@ -1,5 +1,5 @@
//
-// Copyright 2011 Ettus Research LLC
+// Copyright 2011-2012 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -67,6 +67,9 @@ public:
//! Get access to a buffer of inline metadata
virtual transport::bounded_buffer<rx_metadata_t> &get_inline_queue(void) = 0;
+
+ //! Stops threads before deconstruction to avoid race conditions
+ virtual void stop(void) = 0;
};
}} //namespace
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index 607badda9..1db2efa0d 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -413,8 +413,7 @@ usrp1_impl::~usrp1_impl(void){
this->enable_rx(false);
this->enable_tx(false);
)
- _tree.reset(); //resets counts on sptrs held in tree
- _soft_time_ctrl.reset(); //stops cmd task before proceeding
+ _soft_time_ctrl->stop(); //stops cmd task before proceeding
_io_impl.reset(); //stops vandal before other stuff gets deconstructed
}