summaryrefslogtreecommitdiffstats
path: root/metrics/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'metrics/src/tests')
-rw-r--r--metrics/src/tests/loadmetrictest.cpp6
-rw-r--r--metrics/src/tests/metricsettest.cpp2
-rw-r--r--metrics/src/tests/snapshottest.cpp8
-rw-r--r--metrics/src/tests/stresstest.cpp10
-rw-r--r--metrics/src/tests/valuemetrictest.cpp2
5 files changed, 14 insertions, 14 deletions
diff --git a/metrics/src/tests/loadmetrictest.cpp b/metrics/src/tests/loadmetrictest.cpp
index 8ea3e9aee6d..97af77169de 100644
--- a/metrics/src/tests/loadmetrictest.cpp
+++ b/metrics/src/tests/loadmetrictest.cpp
@@ -61,7 +61,7 @@ namespace {
metric("tack", "", "", this)
{ }
- MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+ MetricSet* clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
MetricSet* owner, bool includeUnused = false) const override
{
if (copyType != CLONE) {
@@ -86,7 +86,7 @@ LoadMetricTest::testClone(Metric::CopyType copyType)
LoadMetric<MyMetricSet> metric(loadTypes, myset, &top);
metric[loadTypes["foo"]].metric.addValue(5);
- std::vector<Metric::LP> ownerList;
+ std::vector<Metric::UP> ownerList;
MetricSet::UP copy(dynamic_cast<MetricSet*>(top.clone(ownerList, copyType, 0, true)));
CPPUNIT_ASSERT(copy.get());
@@ -116,7 +116,7 @@ LoadMetricTest::testAdding()
LoadMetric<MyMetricSet> metric(loadTypes, myset, &top);
metric[loadTypes["foo"]].metric.addValue(5);
- std::vector<Metric::LP> ownerList;
+ std::vector<Metric::UP> ownerList;
MetricSet::UP copy(dynamic_cast<MetricSet*>(
top.clone(ownerList, Metric::INACTIVE, 0, false)));
CPPUNIT_ASSERT(copy.get());
diff --git a/metrics/src/tests/metricsettest.cpp b/metrics/src/tests/metricsettest.cpp
index 9ce141feaf3..309794cad1e 100644
--- a/metrics/src/tests/metricsettest.cpp
+++ b/metrics/src/tests/metricsettest.cpp
@@ -147,7 +147,7 @@ MetricSetTest::uniqueTargetMetricsAreAddedToMetricSet()
// 'doge' metric in set2 must be preserved even though it does not exist
// in set1.
- std::vector<Metric::LP> ownerList;
+ std::vector<Metric::UP> ownerList;
set1.addToSnapshot(set2, ownerList);
CPPUNIT_ASSERT(set2.getMetric("wow") != nullptr);
diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp
index 2527a048df6..977f6e4ad68 100644
--- a/metrics/src/tests/snapshottest.cpp
+++ b/metrics/src/tests/snapshottest.cpp
@@ -40,7 +40,7 @@ struct SubSubMetricSet : public MetricSet {
SubSubMetricSet(vespalib::stringref name, const LoadTypeSet& loadTypes_, MetricSet* owner = 0);
~SubSubMetricSet();
- virtual MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+ virtual MetricSet* clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
metrics::MetricSet* owner, bool includeUnused) const;
void incValues();
};
@@ -72,7 +72,7 @@ SubSubMetricSet::SubSubMetricSet(vespalib::stringref name, const LoadTypeSet& lo
SubSubMetricSet::~SubSubMetricSet() { }
MetricSet*
-SubSubMetricSet::clone(std::vector<Metric::LP>& ownerList,
+SubSubMetricSet::clone(std::vector<Metric::UP> &ownerList,
CopyType copyType, metrics::MetricSet* owner,
bool includeUnused) const
{
@@ -114,7 +114,7 @@ struct SubMetricSet : public MetricSet {
SubMetricSet(vespalib::stringref name, const LoadTypeSet& loadTypes_, MetricSet* owner = 0);
~SubMetricSet();
- MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+ MetricSet* clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
metrics::MetricSet* owner, bool includeUnused) const override;
void incValues();
@@ -134,7 +134,7 @@ SubMetricSet::SubMetricSet(vespalib::stringref name, const LoadTypeSet& loadType
SubMetricSet::~SubMetricSet() { }
MetricSet*
-SubMetricSet::clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+SubMetricSet::clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
metrics::MetricSet* owner, bool includeUnused) const
{
if (copyType == INACTIVE) {
diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp
index 9eb13e00a79..905a79252d1 100644
--- a/metrics/src/tests/stresstest.cpp
+++ b/metrics/src/tests/stresstest.cpp
@@ -33,7 +33,7 @@ struct InnerMetricSet : public MetricSet {
InnerMetricSet(const char* name, const LoadTypeSet& lt, MetricSet* owner = 0);
~InnerMetricSet();
- MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+ MetricSet* clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
MetricSet* owner, bool includeUnused) const override;
};
@@ -52,7 +52,7 @@ InnerMetricSet::InnerMetricSet(const char* name, const LoadTypeSet& lt, MetricSe
InnerMetricSet::~InnerMetricSet() { }
MetricSet*
- InnerMetricSet::clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+ InnerMetricSet::clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
MetricSet* owner, bool includeUnused) const
{
if (copyType != CLONE) {
@@ -89,7 +89,7 @@ OuterMetricSet::OuterMetricSet(const LoadTypeSet& lt, MetricSet* owner)
OuterMetricSet::~OuterMetricSet() { }
struct Hammer : public document::Runnable {
- typedef vespalib::LinkedPtr<Hammer> LP;
+ using UP = std::unique_ptr<Hammer>;
OuterMetricSet& _metrics;
const LoadTypeSet& _loadTypes;
@@ -141,9 +141,9 @@ StressTest::testStress()
LOG(info, "Starting load givers");
FastOS_ThreadPool threadPool(256 * 1024);
- std::vector<Hammer::LP> hammers;
+ std::vector<Hammer::UP> hammers;
for (uint32_t i=0; i<10; ++i) {
- hammers.push_back(Hammer::LP(
+ hammers.push_back(Hammer::UP(
new Hammer(metrics, loadTypes, threadPool)));
}
LOG(info, "Waiting to let loadgivers hammer a while");
diff --git a/metrics/src/tests/valuemetrictest.cpp b/metrics/src/tests/valuemetrictest.cpp
index 556592d518b..b06b6806a8b 100644
--- a/metrics/src/tests/valuemetrictest.cpp
+++ b/metrics/src/tests/valuemetrictest.cpp
@@ -178,7 +178,7 @@ void ValueMetricTest::testSmallAverage()
m.addValue(0.0001);
m.addValue(0.0002);
m.addValue(0.0003);
- std::vector<Metric::LP> ownerList;
+ std::vector<Metric::UP> ownerList;
Metric::UP c(m.clone(ownerList, Metric::INACTIVE, 0, false));
std::string expect("test average=0.0002 last=0.0003 min=0.0001 max=0.0003 count=3 total=0.0006");
CPPUNIT_ASSERT_EQUAL(expect, m.toString());