diff options
author | Martin Braun <martin.braun@ettus.com> | 2021-07-06 16:51:55 +0200 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-10-19 12:21:33 -0700 |
commit | b6119e581e6ea9273b188463dc4529c30db140ba (patch) | |
tree | 11517bfd9cff0f0e37120b10c72b4387f7d509a6 /host/lib/usrp/usrp1/soft_time_ctrl.cpp | |
parent | 01d81c7fa5e43210a40c61ce39287c7be245f7c4 (diff) | |
download | uhd-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/usrp/usrp1/soft_time_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/usrp1/soft_time_ctrl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp index 1c3015480..c23f572d0 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp @@ -8,8 +8,8 @@ #include "soft_time_ctrl.hpp" #include <uhd/utils/tasks.hpp> #include <uhdlib/utils/system_time.hpp> -#include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/thread/condition_variable.hpp> +#include <boost/thread/condition.hpp> +#include <chrono> #include <functional> #include <iostream> #include <memory> @@ -52,13 +52,13 @@ public: ******************************************************************/ void set_time(const time_spec_t& time) override { - boost::mutex::scoped_lock lock(_update_mutex); + std::lock_guard<std::mutex> lock(_update_mutex); _time_offset = uhd::get_system_time() - time; } time_spec_t get_time(void) override { - boost::mutex::scoped_lock lock(_update_mutex); + std::lock_guard<std::mutex> lock(_update_mutex); return time_now(); } @@ -69,11 +69,11 @@ public: } UHD_INLINE void sleep_until_time( - boost::mutex::scoped_lock& lock, const time_spec_t& time) + std::unique_lock<std::mutex>& lock, const time_spec_t& time) { - boost::condition_variable cond; + boost::condition cond; // use a condition variable to unlock, sleep, lock - double seconds_to_sleep = (time - time_now()).get_real_secs(); + const double seconds_to_sleep = (time - time_now()).get_real_secs(); cond.timed_wait(lock, pt::microseconds(long(seconds_to_sleep * 1e6))); } @@ -82,7 +82,7 @@ public: ******************************************************************/ size_t recv_post(rx_metadata_t& md, const size_t nsamps) override { - boost::mutex::scoped_lock lock(_update_mutex); + std::lock_guard<std::mutex> lock(_update_mutex); // Since it timed out on the receive, check for inline messages... // Must do a post check because recv() will not wake up for a message. @@ -144,7 +144,7 @@ public: if (not md.has_time_spec) return; - boost::mutex::scoped_lock lock(_update_mutex); + std::unique_lock<std::mutex> lock(_update_mutex); time_spec_t time_at(md.time_spec - TWIDDLE); @@ -168,7 +168,7 @@ public: ******************************************************************/ void recv_cmd_handle_cmd(const stream_cmd_t& cmd) { - boost::mutex::scoped_lock lock(_update_mutex); + std::unique_lock<std::mutex> lock(_update_mutex); // handle the stream at time by sleeping if (not cmd.stream_now) { @@ -227,7 +227,7 @@ public: } private: - boost::mutex _update_mutex; + std::mutex _update_mutex; size_t _nsamps_remaining; stream_cmd_t::stream_mode_t _stream_mode; time_spec_t _time_offset; |