aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/transport/nirio
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-07-06 16:51:55 +0200
committerAaron Rossetto <aaron.rossetto@ni.com>2021-10-19 12:21:33 -0700
commitb6119e581e6ea9273b188463dc4529c30db140ba (patch)
tree11517bfd9cff0f0e37120b10c72b4387f7d509a6 /host/lib/transport/nirio
parent01d81c7fa5e43210a40c61ce39287c7be245f7c4 (diff)
downloaduhd-b6119e581e6ea9273b188463dc4529c30db140ba.tar.gz
uhd-b6119e581e6ea9273b188463dc4529c30db140ba.tar.bz2
uhd-b6119e581e6ea9273b188463dc4529c30db140ba.zip
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 <mutex>`. The corresponding Boost includes were removed. In some cases, this exposed issues with implicit Boost includes elsewhere. The missing explicit includes were added.
Diffstat (limited to 'host/lib/transport/nirio')
-rw-r--r--host/lib/transport/nirio/niusrprio_session.cpp8
-rw-r--r--host/lib/transport/nirio/rpc/rpc_client.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/transport/nirio/niusrprio_session.cpp b/host/lib/transport/nirio/niusrprio_session.cpp
index b2ea659df..00838075f 100644
--- a/host/lib/transport/nirio/niusrprio_session.cpp
+++ b/host/lib/transport/nirio/niusrprio_session.cpp
@@ -51,7 +51,7 @@ nirio_status niusrprio_session::enumerate(
nirio_status niusrprio_session::open(nifpga_lvbitx::sptr lvbitx, bool force_download)
{
- boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+ std::unique_lock<std::recursive_mutex> lock(_session_mutex);
_lvbitx = lvbitx;
@@ -101,7 +101,7 @@ nirio_status niusrprio_session::open(nifpga_lvbitx::sptr lvbitx, bool force_down
void niusrprio_session::close(bool skip_reset)
{
- boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+ std::unique_lock<std::recursive_mutex> lock(_session_mutex);
if (_session_open) {
nirio_status status = NiRio_Status_Success;
@@ -114,14 +114,14 @@ void niusrprio_session::close(bool skip_reset)
nirio_status niusrprio_session::reset()
{
- boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+ std::unique_lock<std::recursive_mutex> lock(_session_mutex);
return _rpc_client.niusrprio_reset_device(_resource_name);
}
nirio_status niusrprio_session::download_bitstream_to_flash(
const std::string& bitstream_path)
{
- boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+ std::unique_lock<std::recursive_mutex> lock(_session_mutex);
return _rpc_client.niusrprio_download_fpga_to_flash(_resource_name, bitstream_path);
}
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<std::mutex> 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<std::mutex> 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<std::mutex> lock(_mutex);
_exec_err = err;
if (transferred != expected) {
_exec_err.assign(boost::asio::error::operation_aborted,