From 49d05ada725283aedbc6734533e287b6a7b669d2 Mon Sep 17 00:00:00 2001 From: Virendra Kakade Date: Wed, 24 Apr 2019 14:36:42 -0700 Subject: mpmd: Release resources on destruction This will clear the property tree, block registry, transport managers, and motherboard list on destruction of mpmd_impl. --- host/lib/usrp/mpmd/mpmd_impl.cpp | 4 +++- host/lib/usrp/mpmd/mpmd_mboard_impl.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index 2f3584498..05d847060 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -231,7 +231,9 @@ mpmd_impl::mpmd_impl(const device_addr_t& device_args) mpmd_impl::~mpmd_impl() { - /* nop */ + _rfnoc_block_ctrl.clear(); + _tree.reset(); + _mb.clear(); } /***************************************************************************** diff --git a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp index e2d347778..8bf8d6826 100644 --- a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp @@ -302,9 +302,9 @@ mpmd_mboard_impl::mpmd_mboard_impl( mpmd_mboard_impl::~mpmd_mboard_impl() { - // Destroy the claimer task to avoid spurious asynchronous reclaim call after the - // unclaim. - UHD_SAFE_CALL(dump_logs(); _claimer_task.reset(); + // Destroy the claimer task to avoid spurious asynchronous reclaim call + // after the unclaim. + UHD_SAFE_CALL(dump_logs(); _claimer_task.reset(); _xport_mgr.reset(); if (not rpc->request_with_token("unclaim")) { UHD_LOG_WARNING("MPMD", "Failure to ack unclaim!"); }); -- cgit v1.2.3