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/experts/expert_container.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'host/lib/experts/expert_container.cpp') diff --git a/host/lib/experts/expert_container.cpp b/host/lib/experts/expert_container.cpp index 0658e9fa3..0fc159a98 100644 --- a/host/lib/experts/expert_container.cpp +++ b/host/lib/experts/expert_container.cpp @@ -14,9 +14,9 @@ #include #include #include -#include #include #include +#include #ifdef UHD_EXPERT_LOGGING # define EX_LOG(depth, str) _log(depth, str) @@ -79,8 +79,8 @@ public: void resolve_all(bool force = false) override { - boost::lock_guard resolve_lock(_resolve_mutex); - boost::lock_guard lock(_mutex); + std::lock_guard resolve_lock(_resolve_mutex); + std::lock_guard lock(_mutex); EX_LOG(0, str(boost::format("resolve_all(%s)") % (force ? "force" : ""))); // Do a full resolve of the graph _resolve_helper("", "", force); @@ -88,8 +88,8 @@ public: void resolve_from(const std::string&) override { - boost::lock_guard resolve_lock(_resolve_mutex); - boost::lock_guard lock(_mutex); + std::lock_guard resolve_lock(_resolve_mutex); + std::lock_guard lock(_mutex); EX_LOG(0, "resolve_from (overridden to resolve_all)"); // Do a full resolve of the graph // Not optimizing the traversal using node_name to reduce experts complexity @@ -98,8 +98,8 @@ public: void resolve_to(const std::string&) override { - boost::lock_guard resolve_lock(_resolve_mutex); - boost::lock_guard lock(_mutex); + std::lock_guard resolve_lock(_resolve_mutex); + std::lock_guard lock(_mutex); EX_LOG(0, "resolve_to (overridden to resolve_all)"); // Do a full resolve of the graph // Not optimizing the traversal using node_name to reduce experts complexity @@ -271,7 +271,7 @@ public: #endif } - inline boost::recursive_mutex& resolve_mutex() override + inline std::recursive_mutex& resolve_mutex() override { return _resolve_mutex; } @@ -279,7 +279,7 @@ public: protected: void add_data_node(dag_vertex_t* data_node, auto_resolve_mode_t resolve_mode) override { - boost::lock_guard lock(_mutex); + std::lock_guard lock(_mutex); // Sanity check node pointer if (data_node == NULL) { @@ -330,7 +330,7 @@ protected: void add_worker(worker_node_t* worker) override { - boost::lock_guard lock(_mutex); + std::lock_guard lock(_mutex); // Sanity check node pointer if (worker == NULL) { @@ -400,7 +400,7 @@ protected: void clear() override { - boost::lock_guard lock(_mutex); + std::lock_guard lock(_mutex); EX_LOG(0, "clear()"); // Iterate through the vertices and release their node storage @@ -553,8 +553,8 @@ private: vertex_map_t _worker_map; // A map from vertex name to vertex descriptor for workers vertex_map_t _datanode_map; // A map from vertex name to vertex descriptor for data nodes - boost::mutex _mutex; - boost::recursive_mutex _resolve_mutex; + std::mutex _mutex; + std::recursive_mutex _resolve_mutex; }; expert_container::sptr expert_container::make(const std::string& name) -- cgit v1.2.3