max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix: rule of 3 for xtimit (#10818)

Browse source 
This PR adds a missing move assignment operator, and deletes the copy
assignment operator.

C++ types should not implement move constructors without also
implementing move assignment. This also ensures that `m_fn` is correctly
emptied after a move, which is not guaranteed by the standard.

This change is also needed to allow `lean::optional` to be eventually
replaced by `std::optional`.
This commit is contained in:
Eric Wieser 2025-10-21 13:01:23 +01:00 • committed by GitHub
parent bce47c6e0d
commit 3f82b307aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/util/timeit.h
View file

@ -55,10 +55,25 @@ public:
}
xtimeit(std::function<void(second_duration)> const & fn) : xtimeit(second_duration(0), fn) {} // NOLINT
xtimeit(xtimeit const &) = delete;
xtimeit(xtimeit &&) = default;
xtimeit& operator=(xtimeit const &) = delete;
xtimeit(xtimeit && other) noexcept
: m_threshold(std::move(other.m_threshold)),
m_excluded(std::move(other.m_excluded)),
m_start(std::move(other.m_start)),
m_fn(std::move(other.m_fn)) { // TODO: use `std::exchange(_, nullptr)` in C++14
other.m_fn = nullptr;
}
xtimeit& operator=(xtimeit && other) noexcept {
m_threshold = std::move(other.m_threshold);
m_excluded = std::move(other.m_excluded);
m_start = std::move(other.m_start);
m_fn = std::move(other.m_fn); // TODO: use `std::exchange(_, nullptr)` in C++14
other.m_fn = nullptr;
}
~xtimeit() {
if (!m_fn) return;
auto diff = get_elapsed();
if (diff >= m_threshold && m_fn) {
if (diff >= m_threshold) {
m_fn(diff);
}
}