diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-28 21:16:26 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:40 +0100 |
commit | e1a678feb2deddeab5a78be77e16f3cdf0a614a9 (patch) | |
tree | 342fdd803d4597d05e2cef34d667fba2541f9f50 /memfilepersistence | |
parent | e7195ab5e2d76848c1d3ac1004f54edf19dfb72d (diff) |
Loosen up the metrics stuff further.
Diffstat (limited to 'memfilepersistence')
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp | 2 | ||||
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp index 9e3a2b44eb0..638ff05fc60 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp @@ -45,7 +45,7 @@ MemFilePersistenceMetrics::~MemFilePersistenceMetrics() { } MemFilePersistenceThreadMetrics* MemFilePersistenceMetrics::addThreadMetrics() { - metrics::MetricLockGuard metricLock(_component.getMetricManagerLock()); + vespalib::MonitorGuard metricLock(_component.getMetricManagerLock()); vespalib::LockGuard guard(_threadMetricsLock); if (!_sumMetric.get()) { diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h index 6c6e1d882d1..81c64142777 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h @@ -3,6 +3,8 @@ #include <vespa/metrics/metrics.h> #include <vespa/memfilepersistence/mapper/serializationmetrics.h> +#include <vespa/vespalib/util/sync.h> +#include <list> namespace storage { |