3 files changed, 57 insertions, 2 deletions
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
index b39b6083c..0dee310a8 100644
--- a/host/include/uhd/utils/CMakeLists.txt
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -26,6 +26,7 @@ INSTALL(FILES
     images.hpp
     pimpl.hpp
     props.hpp
+    safe_call.hpp
     safe_main.hpp
     static.hpp
     thread_priority.hpp
diff --git a/host/include/uhd/utils/safe_call.hpp b/host/include/uhd/utils/safe_call.hpp
new file mode 100644
index 000000000..6b2c210af
--- /dev/null
+++ b/host/include/uhd/utils/safe_call.hpp
@@ -0,0 +1,45 @@
+//
+// Copyright 2011 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_SAFE_CALL_HPP
+#define INCLUDED_UHD_UTILS_SAFE_CALL_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/exception.hpp>
+#include <uhd/utils/warning.hpp>
+
+//! helper macro for safe call to produce warnings
+#define _UHD_SAFE_CALL_WARNING(code, what) uhd::warning::post( \
+    UHD_THROW_SITE_INFO("Exception caught in safe-call.") + #code + " -> " + what \
+);
+
+/*!
+ * A safe-call catches all exceptions thrown by code,
+ * and creates a verbose warning about the exception.
+ * Usage: UHD_SAFE_CALL(some_code_to_call();)
+ * \param code the block of code to call safely
+ */
+#define UHD_SAFE_CALL(code) \
+    try{code} \
+    catch(const std::exception &e){ \
+        _UHD_SAFE_CALL_WARNING(code, e.what()); \
+    } \
+    catch(...){ \
+        _UHD_SAFE_CALL_WARNING(code, "unknown exception"); \
+    }
+
+#endif /* INCLUDED_UHD_UTILS_SAFE_CALL_HPP */
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index f20d3ab46..92a7b2f93 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -18,6 +18,7 @@
 #include "usrp2_impl.hpp"
 #include "usrp2_regs.hpp"
 #include "fw_common.h"
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/usrp/gps_ctrl.hpp>
 #include <uhd/usrp/misc_utils.hpp>
 #include <uhd/usrp/dsp_utils.hpp>
@@ -169,8 +170,16 @@ usrp2_mboard_impl::usrp2_mboard_impl(
 }
 
 usrp2_mboard_impl::~usrp2_mboard_impl(void){
-    _iface->poke32(_iface->regs.tx_ctrl_cycles_per_up, 0);
-    _iface->poke32(_iface->regs.tx_ctrl_packets_per_up, 0);
+    //Safely destruct all RAII objects in an mboard.
+    //This prevents the mboard deconstructor from throwing,
+    //which allows the device to be safely deconstructed.
+    UHD_SAFE_CALL(_iface->poke32(_iface->regs.tx_ctrl_cycles_per_up, 0);)
+    UHD_SAFE_CALL(_iface->poke32(_iface->regs.tx_ctrl_packets_per_up, 0);)
+    UHD_SAFE_CALL(_dboard_manager.reset();)
+    UHD_SAFE_CALL(_dboard_iface.reset();)
+    UHD_SAFE_CALL(_codec_ctrl.reset();)
+    UHD_SAFE_CALL(_clock_ctrl.reset();)
+    UHD_SAFE_CALL(_gps_ctrl.reset();)
 }
 
 /***********************************************************************