From b6119e581e6ea9273b188463dc4529c30db140ba Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
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 <mutex>`. 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/usrp/x300/x300_fw_ctrl.cpp | 10 +++++-----
 host/lib/usrp/x300/x300_fw_uart.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'host/lib/usrp/x300')

diff --git a/host/lib/usrp/x300/x300_fw_ctrl.cpp b/host/lib/usrp/x300/x300_fw_ctrl.cpp
index 9cbad7576..110025228 100644
--- a/host/lib/usrp/x300/x300_fw_ctrl.cpp
+++ b/host/lib/usrp/x300/x300_fw_ctrl.cpp
@@ -16,8 +16,8 @@
 #include <uhd/utils/log.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/format.hpp>
-#include <boost/thread/mutex.hpp>
 #include <chrono>
+#include <mutex>
 #include <thread>
 
 using namespace uhd;
@@ -35,14 +35,14 @@ public:
 
     void flush(void)
     {
-        boost::mutex::scoped_lock lock(reg_access);
+        std::lock_guard<std::mutex> lock(reg_access);
         __flush();
     }
 
     void poke32(const wb_addr_type addr, const uint32_t data) override
     {
         for (size_t i = 1; i <= num_retries; i++) {
-            boost::mutex::scoped_lock lock(reg_access);
+            std::lock_guard<std::mutex> lock(reg_access);
             try {
                 return this->__poke32(addr, data);
             } catch (const uhd::io_error& ex) {
@@ -60,7 +60,7 @@ public:
     uint32_t peek32(const wb_addr_type addr) override
     {
         for (size_t i = 1; i <= num_retries; i++) {
-            boost::mutex::scoped_lock lock(reg_access);
+            std::lock_guard<std::mutex> lock(reg_access);
             try {
                 uint32_t data = this->__peek32(addr);
                 return data;
@@ -85,7 +85,7 @@ protected:
     virtual void __flush()                                              = 0;
     virtual std::string __loc_info()                                    = 0;
 
-    boost::mutex reg_access;
+    std::mutex reg_access;
 };
 
 
diff --git a/host/lib/usrp/x300/x300_fw_uart.cpp b/host/lib/usrp/x300/x300_fw_uart.cpp
index 1bfc2a2e4..804a1a357 100644
--- a/host/lib/usrp/x300/x300_fw_uart.cpp
+++ b/host/lib/usrp/x300/x300_fw_uart.cpp
@@ -11,8 +11,8 @@
 #include <uhd/types/serial.hpp>
 #include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/log.hpp>
-#include <boost/format.hpp>
 #include <chrono>
+#include <mutex>
 
 using namespace uhd;
 
@@ -52,7 +52,7 @@ struct x300_uart_iface : uart_iface
 
     void write_uart(const std::string& buff) override
     {
-        boost::mutex::scoped_lock lock(_write_mutex);
+        std::lock_guard<std::mutex> lock(_write_mutex);
         for (const char ch : buff) {
             this->putchar(ch);
         }
@@ -120,7 +120,7 @@ struct x300_uart_iface : uart_iface
 
     std::string read_uart(double timeout) override
     {
-        boost::mutex::scoped_lock lock(_read_mutex);
+        std::lock_guard<std::mutex> lock(_read_mutex);
         const auto exit_time = std::chrono::steady_clock::now()
                                + std::chrono::microseconds(int64_t(timeout * 1e6));
 
@@ -156,8 +156,8 @@ struct x300_uart_iface : uart_iface
     uint32_t _last_device_rxoffset;
     std::vector<uint32_t> _rxcache;
     std::string _rxbuff;
-    boost::mutex _read_mutex;
-    boost::mutex _write_mutex;
+    std::mutex _read_mutex;
+    std::mutex _write_mutex;
 };
 
 uart_iface::sptr x300_make_uart_iface(wb_iface::sptr iface)
-- 
cgit v1.2.3