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/transport/nirio/rpc/rpc_client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'host/lib/transport/nirio/rpc/rpc_client.cpp') diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp index 661f72e81..7b5970610 100644 --- a/host/lib/transport/nirio/rpc/rpc_client.cpp +++ b/host/lib/transport/nirio/rpc/rpc_client.cpp @@ -109,7 +109,7 @@ const boost::system::error_code& rpc_client::call(func_id_t func_id, func_args_reader_t& out_args, boost::posix_time::milliseconds timeout) { - boost::mutex::scoped_lock lock(_mutex); + std::unique_lock lock(_mutex); if (_io_service_thread.get()) { _request.header.func_id = func_id; @@ -168,7 +168,7 @@ const boost::system::error_code& rpc_client::call(func_id_t func_id, void rpc_client::_handle_response_hdr( const boost::system::error_code& err, size_t transferred, size_t expected) { - boost::mutex::scoped_lock lock(_mutex); + std::lock_guard lock(_mutex); _exec_err = err; if (!_exec_err && (transferred == expected)) { // Response header received. Verify that it is expected @@ -205,7 +205,7 @@ void rpc_client::_handle_response_hdr( void rpc_client::_handle_response_data( const boost::system::error_code& err, size_t transferred, size_t expected) { - boost::mutex::scoped_lock lock(_mutex); + std::lock_guard lock(_mutex); _exec_err = err; if (transferred != expected) { _exec_err.assign(boost::asio::error::operation_aborted, -- cgit v1.2.3