diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-30 13:03:07 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:41 +0100 |
| commit | c650f2f379179780d428fb5505a0ed3d52f48ba4 (patch) | |
| tree | 5780a899b56d66aa8172c3ab296afc4f778915d1 /metrics | |
| parent | f1d0f2af6b0bae3042b77f37b2461aa1229eca45 (diff) | |
Targeted include.
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 10 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/metricmanager.h | 11 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/valuemetricvalues.hpp | 1 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/xmlwriter.cpp | 1 |
4 files changed, 13 insertions, 10 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 2ac3954fa31..6267ef88b04 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -11,8 +11,8 @@ #include <vespa/metrics/jsonwriter.h> #include <vespa/metrics/textwriter.h> #include <vespa/metrics/xmlwriter.h> +#include <vespa/vespalib/util/exceptions.h> #include <vespa/log/log.h> -#include <stack> LOG_SETUP(".metrics.manager"); @@ -21,6 +21,14 @@ namespace metrics { typedef MetricsmanagerConfig Config; void +MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const { + if (!g.monitors(_waiter)) { + throw vespalib::IllegalArgumentException( + "Given lock does not lock the metric lock.", VESPA_STRLOC); + } +} + +void MetricManager::ConsumerSpec::print(std::ostream& out, bool verbose, const std::string& indent) const { diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 28e03b01aff..ad2a807f8f4 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -292,15 +292,8 @@ private: void handleMetricsAltered(const MetricLockGuard & guard); typedef std::pair<uint32_t, std::string> SnapSpec; - static std::vector<SnapSpec> createSnapshotPeriods( - const MetricsmanagerConfig& config); - void assertMetricLockLocked(const MetricLockGuard& g) const { - if (!g.monitors(_waiter)) { - throw vespalib::IllegalArgumentException( - "Given lock does not lock the metric lock.", VESPA_STRLOC); - } - } - + static std::vector<SnapSpec> createSnapshotPeriods( const MetricsmanagerConfig& config); + void assertMetricLockLocked(const MetricLockGuard& g) const; }; } // metrics diff --git a/metrics/src/vespa/metrics/valuemetricvalues.hpp b/metrics/src/vespa/metrics/valuemetricvalues.hpp index fe58a1f53c6..d8becca3e72 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.hpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.hpp @@ -2,6 +2,7 @@ #pragma once #include "valuemetricvalues.h" +#include <vespa/vespalib/util/exceptions.h> #include <ostream> namespace metrics { diff --git a/metrics/src/vespa/metrics/xmlwriter.cpp b/metrics/src/vespa/metrics/xmlwriter.cpp index 01c509030ff..66f83cdd4bf 100644 --- a/metrics/src/vespa/metrics/xmlwriter.cpp +++ b/metrics/src/vespa/metrics/xmlwriter.cpp @@ -6,6 +6,7 @@ #include <vespa/metrics/metricset.h> #include <vespa/metrics/metricsnapshot.h> #include <vespa/metrics/valuemetric.h> +#include <sstream> namespace metrics { |