diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-12-15 15:30:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-12-15 15:30:08 +0000 |
commit | dda9a7c020ae24e18b6f7701477b95541cbca109 (patch) | |
tree | 3a7138d6938ed1fde5a1f94c52a94c1c9a34d630 /metrics | |
parent | 37be7b1516dcd42bfd34b6f9ffbe3896959717eb (diff) |
Fix the MetricLockGuard::owns and its use to match the intention.
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 2 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/updatehook.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 6447e12a0d2..8ca74384af0 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -32,7 +32,7 @@ MetricManager::Timer::getTime() const { void MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const { - if (g.owns(_waiter)) { + if ( ! g.owns(_waiter)) { throw vespalib::IllegalArgumentException("Given lock does not lock the metric lock.", VESPA_STRLOC); } } diff --git a/metrics/src/vespa/metrics/updatehook.cpp b/metrics/src/vespa/metrics/updatehook.cpp index 99051e8df64..b627d55b09e 100644 --- a/metrics/src/vespa/metrics/updatehook.cpp +++ b/metrics/src/vespa/metrics/updatehook.cpp @@ -10,7 +10,7 @@ MetricLockGuard::MetricLockGuard(std::mutex & mutex) bool MetricLockGuard::owns(const std::mutex & mutex) const { - return (_guard.mutex() == &mutex) && !_guard.owns_lock(); + return (_guard.mutex() == &mutex) && _guard.owns_lock(); } MetricLockGuard::~MetricLockGuard() = default; |