From 00cedaea7dfd6c400b265f381d0da070c0950bf0 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 2 Sep 2011 14:07:13 -0700 Subject: usrp1: reset control objects in this order to avoid race conditions --- host/lib/usrp/usrp1/usrp1_impl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 8f6a582fa..b2da16837 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -390,11 +390,13 @@ usrp1_impl::usrp1_impl(const device_addr_t &device_addr){ } usrp1_impl::~usrp1_impl(void){ - _io_impl.reset(); //stops vandal before other stuff gets deconstructed UHD_SAFE_CALL( 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 + _io_impl.reset(); //stops vandal before other stuff gets deconstructed } /*! -- cgit v1.2.3