aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/error_c.cpp
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/error_c.cpp
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/error_c.cpp')
-rw-r--r--host/lib/error_c.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/error_c.cpp b/host/lib/error_c.cpp
index 0914ca4e7..fcfa5ce06 100644
--- a/host/lib/error_c.cpp
+++ b/host/lib/error_c.cpp
@@ -8,8 +8,8 @@
#include <uhd/error.h>
#include <uhd/exception.hpp>
#include <uhd/utils/static.hpp>
-#include <boost/thread/mutex.hpp>
#include <cstring>
+#include <mutex>
#define MAP_TO_ERROR(exception_type, error_type) \
if (dynamic_cast<const uhd::exception_type*>(e)) \
@@ -40,17 +40,17 @@ uhd_error error_from_uhd_exception(const uhd::exception* e)
// get_c_global_error_string() instead.
UHD_SINGLETON_FCN(std::string, _c_global_error_string)
-static boost::mutex _error_c_mutex;
+static std::mutex _error_c_mutex;
std::string get_c_global_error_string()
{
- boost::mutex::scoped_lock lock(_error_c_mutex);
+ std::lock_guard<std::mutex> lock(_error_c_mutex);
return _c_global_error_string();
}
void set_c_global_error_string(const std::string& msg)
{
- boost::mutex::scoped_lock lock(_error_c_mutex);
+ std::lock_guard<std::mutex> lock(_error_c_mutex);
_c_global_error_string() = msg;
}