aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/common
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2020-09-03 12:32:49 -0700
committermichael-west <michael.west@ettus.com>2020-09-04 08:48:25 -0700
commitab9f4eab72df289d8d160082287112195e4604b7 (patch)
tree9d5d44d47edb8f3477952aa4e210624555f004f3 /host/lib/usrp/common
parentbf39ce1110e91f8e9e3270963f98f6200c9efdb7 (diff)
downloaduhd-ab9f4eab72df289d8d160082287112195e4604b7.tar.gz
uhd-ab9f4eab72df289d8d160082287112195e4604b7.tar.bz2
uhd-ab9f4eab72df289d8d160082287112195e4604b7.zip
lib: Remove recursive locks in apply_corrections
There were locks in the apply_tx/rx_fe_corrections() methods that were acquired before calling methods that re-acquired the locks. The mutexes were not recursive, so it caused applications to lock up. The locks are unnecessary in the top level methods, so they are being removed. Signed-off-by: michael-west <michael.west@ettus.com>
Diffstat (limited to 'host/lib/usrp/common')
-rw-r--r--host/lib/usrp/common/apply_corrections.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp
index 3cdf3d29f..762a9018b 100644
--- a/host/lib/usrp/common/apply_corrections.cpp
+++ b/host/lib/usrp/common/apply_corrections.cpp
@@ -175,8 +175,6 @@ void uhd::usrp::apply_tx_fe_corrections(
const double lo_freq // actual lo freq
)
{
- std::lock_guard<std::mutex> l(corrections_mutex);
-
// extract eeprom serial
const uhd::fs_path db_path = "dboards/" + slot + "/tx_eeprom";
const std::string db_serial =
@@ -192,7 +190,6 @@ void uhd::usrp::apply_rx_fe_corrections(
const double lo_freq // actual lo freq
)
{
- std::lock_guard<std::mutex> l(corrections_mutex);
const uhd::fs_path db_path = "dboards/" + slot + "/rx_eeprom";
const std::string db_serial =
sub_tree->access<uhd::usrp::dboard_eeprom_t>(db_path).get().serial;