diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-03 14:24:41 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-04 18:15:16 +0000 |
commit | 8946dbea418f760e4f0a5cbe2eb2bcbcddd25032 (patch) | |
tree | fc254ea5dea29ddf6a395b8bcdcb8c7540d22238 /metrics | |
parent | 7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff) |
FastOS_THread::Sleep -> std::chrono::sleep_for
Renamed Timer -> ScheduledExecutor.
Do not include thread.h when not needed in header files.
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/tests/metricmanagertest.cpp | 6 | ||||
-rw-r--r-- | metrics/src/tests/stresstest.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp index 1d954a641b6..6407bb73ecb 100644 --- a/metrics/src/tests/metricmanagertest.cpp +++ b/metrics/src/tests/metricmanagertest.cpp @@ -10,8 +10,10 @@ #include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/xmlstream.h> -#include <vespa/log/log.h> +#include <vespa/vespalib/util/time.h> +#include <thread> +#include <vespa/log/log.h> LOG_SETUP(".test.metricmanager"); namespace metrics { @@ -386,7 +388,7 @@ bool waitForTimeProcessed(const MetricManager& mm, while (time(0) < lastchance) { if (mm.getLastProcessedTime() >= processtime) return true; mm.timeChangedNotification(); - FastOS_Thread::Sleep(10); + std::this_thread::sleep_for(10ms); } return false; } diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp index 4a6d2f4a2ea..20693d2f841 100644 --- a/metrics/src/tests/stresstest.cpp +++ b/metrics/src/tests/stresstest.cpp @@ -4,6 +4,7 @@ #include <vespa/metrics/metricmanager.h> #include <vespa/metrics/metrics.h> #include <vespa/metrics/summetric.hpp> +#include <thread> #include <vespa/vespalib/gtest/gtest.h> #include <vespa/log/log.h> @@ -137,7 +138,7 @@ TEST(StressTest, test_stress) new Hammer(metrics, loadTypes, threadPool))); } LOG(info, "Waiting to let loadgivers hammer a while"); - FastOS_Thread::Sleep(5 * 1000); + std::this_thread::sleep_for(std::chrono::milliseconds(5 * 1000)); LOG(info, "Removing loadgivers"); hammers.clear(); |