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.
---
 .../include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'host/lib/include/uhdlib/usrp/common')

diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
index 0e1041642..7fa24f046 100644
--- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
@@ -13,10 +13,10 @@
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/log.hpp>
 #include <stdint.h>
-#include <boost/thread.hpp>
 #include <chrono>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <queue>
 
 namespace uhd { namespace usrp {
@@ -62,7 +62,7 @@ struct recv_packet_demuxer_3000 : std::enable_shared_from_this<recv_packet_demux
         //-- Check the queue to see if we already have a buffer
         //----------------------------------------------------------
         {
-            boost::mutex::scoped_lock l(mutex);
+            std::lock_guard<std::mutex> l(mutex);
             queue_type_t& queue = _queues[sid];
             if (not queue.empty()) {
                 buff = queue.front();
@@ -76,7 +76,7 @@ struct recv_packet_demuxer_3000 : std::enable_shared_from_this<recv_packet_demux
             if (buff) {
                 const uint32_t new_sid = uhd::wtohx(buff->cast<const uint32_t*>()[1]);
                 if (new_sid != sid) {
-                    boost::mutex::scoped_lock l(mutex);
+                    std::lock_guard<std::mutex> l(mutex);
                     if (_queues.count(new_sid) == 0)
                         UHD_LOGGER_ERROR("STREAMER")
                             << "recv packet demuxer unexpected sid 0x" << std::hex
@@ -92,7 +92,7 @@ struct recv_packet_demuxer_3000 : std::enable_shared_from_this<recv_packet_demux
 
     void realloc_sid(const uint32_t sid)
     {
-        boost::mutex::scoped_lock l(mutex);
+        std::lock_guard<std::mutex> l(mutex);
         while (not _queues[sid].empty()) // allocated and clears if already allocated
         {
             _queues[sid].pop();
@@ -104,7 +104,7 @@ struct recv_packet_demuxer_3000 : std::enable_shared_from_this<recv_packet_demux
     typedef std::queue<transport::managed_recv_buffer::sptr> queue_type_t;
     std::map<uint32_t, queue_type_t> _queues;
     transport::zero_copy_if::sptr _xport;
-    boost::mutex mutex;
+    std::mutex mutex;
 };
 
 struct recv_packet_demuxer_proxy_3000 : transport::zero_copy_if
-- 
cgit v1.2.3