From b6119e581e6ea9273b188463dc4529c30db140ba Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 6 Jul 2021 16:51:55 +0200 Subject: uhd: Replace Boost mutexes and locks with standard options This is a very mechanical task that could almost have been done with sed. Boost versions of mutexes and locks were removed, and replaced with std:: versions. The replacement tables are as follows: == Mutexes == - boost::mutex -> std::mutex - boost::recursive_mutex -> std::recursive_mutex Mutexes behave identically between Boost and std:: and have the same API. == Locks == C++11 has only two types of lock that we use/need in UHD: - std::lock_guard: Identical to boost::lock_guard - std::unique_lock: Identical to boost::unique_lock Boost also has boost::mutex::scoped_lock, which is a typedef for boost::unique_lock<>. However, we often have used scoped_lock where we meant to use lock_guard<>. The name is a bit misleading, "scoped lock" sounding a bit like an RAII mechanism. Therefore, some previous boost::mutex::scoped_lock are now std::lock_guard<>. std::unique_lock is required when doing more than RAII locking (i.e., unlocking, relocking, usage with condition variables, etc.). == Condition Variables == Condition variables were out of the scope of this lock/mutex change, but in UHD, we inconsistently use boost::condition vs. boost::condition_variable. The former is a templated version of the latter, and thus works fine with std::mutex'es. Therefore, some boost::condition_variable where changed to boost::condition. All locks and mutexes use `#include `. The corresponding Boost includes were removed. In some cases, this exposed issues with implicit Boost includes elsewhere. The missing explicit includes were added. --- host/lib/include/uhdlib/experts/expert_container.hpp | 4 ++-- host/lib/include/uhdlib/experts/expert_nodes.hpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'host/lib/include/uhdlib/experts') diff --git a/host/lib/include/uhdlib/experts/expert_container.hpp b/host/lib/include/uhdlib/experts/expert_container.hpp index bb05ae334..c794e9d8c 100644 --- a/host/lib/include/uhdlib/experts/expert_container.hpp +++ b/host/lib/include/uhdlib/experts/expert_container.hpp @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include namespace uhd { namespace experts { @@ -153,7 +153,7 @@ private: * container. * */ - virtual boost::recursive_mutex& resolve_mutex() = 0; + virtual std::recursive_mutex& resolve_mutex() = 0; /*! * Add a data node to the expert graph diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp index ce061ca26..66dd0f246 100644 --- a/host/lib/include/uhdlib/experts/expert_nodes.hpp +++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp @@ -14,11 +14,12 @@ #include #include #include -#include -#include #include #include #include +#include +#include +#include namespace uhd { namespace experts { @@ -130,7 +131,7 @@ public: // from the outside world (of experts) using read and write callbacks. We // assume that if a callback mutex is passed into the data node that it will // be accessed from the outside and tag the data node as a PROPERTY. - data_node_t(const std::string& name, boost::recursive_mutex* mutex = NULL) + data_node_t(const std::string& name, std::recursive_mutex* mutex = NULL) : dag_vertex_t(mutex ? CLASS_PROPERTY : CLASS_DATA, name) , _callback_mutex(mutex) , _data() @@ -138,9 +139,8 @@ public: { } - data_node_t(const std::string& name, - const data_t& value, - boost::recursive_mutex* mutex = NULL) + data_node_t( + const std::string& name, const data_t& value, std::recursive_mutex* mutex = NULL) : dag_vertex_t(mutex ? CLASS_PROPERTY : CLASS_DATA, name) , _callback_mutex(mutex) , _data(value) @@ -199,7 +199,7 @@ public: if (_callback_mutex == NULL) throw uhd::assertion_error( "node " + get_name() + " is missing the callback mutex"); - boost::lock_guard lock(*_callback_mutex); + std::lock_guard lock(*_callback_mutex); set(value); _author = AUTHOR_USER; if (is_dirty() and has_write_callback()) { @@ -213,7 +213,7 @@ public: if (_callback_mutex == NULL) throw uhd::assertion_error( "node " + get_name() + " is missing the callback mutex"); - boost::lock_guard lock(*_callback_mutex); + std::lock_guard lock(*_callback_mutex); if (has_read_callback()) { _rd_callback(std::string(get_name())); } @@ -252,7 +252,7 @@ private: _rd_callback = nullptr; } - boost::recursive_mutex* _callback_mutex; + std::recursive_mutex* _callback_mutex; callback_func_t _rd_callback; callback_func_t _wr_callback; dirty_tracked _data; -- cgit v1.2.3