diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-12-04 11:01:07 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-12-04 11:01:07 +0000 |
commit | 9505ca7aa4ee0822ac080f18eef2b4aba7c3efc7 (patch) | |
tree | 48222031886ca333fdc397a637a1aa2a5fe92d4a /staging_vespalib | |
parent | 3a4bf578ddf141622ac40d5bd7346f7f1cfb2970 (diff) |
move MockTick
Diffstat (limited to 'staging_vespalib')
-rw-r--r-- | staging_vespalib/src/tests/metrics/CMakeLists.txt | 1 | ||||
-rw-r--r-- | staging_vespalib/src/tests/metrics/mock_tick.cpp (renamed from staging_vespalib/src/vespa/vespalib/metrics/mock_tick.cpp) | 0 | ||||
-rw-r--r-- | staging_vespalib/src/tests/metrics/mock_tick.h (renamed from staging_vespalib/src/vespa/vespalib/metrics/mock_tick.h) | 10 | ||||
-rw-r--r-- | staging_vespalib/src/tests/metrics/simple_metrics_test.cpp | 2 | ||||
-rw-r--r-- | staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt | 1 | ||||
-rw-r--r-- | staging_vespalib/src/vespa/vespalib/metrics/clock.h | 7 |
6 files changed, 10 insertions, 11 deletions
diff --git a/staging_vespalib/src/tests/metrics/CMakeLists.txt b/staging_vespalib/src/tests/metrics/CMakeLists.txt index fc9a496c972..a441631fd15 100644 --- a/staging_vespalib/src/tests/metrics/CMakeLists.txt +++ b/staging_vespalib/src/tests/metrics/CMakeLists.txt @@ -2,6 +2,7 @@ vespa_add_executable(staging_vespalib_metrics_test_app TEST SOURCES simple_metrics_test.cpp + mock_tick.cpp DEPENDS staging_vespalib ) diff --git a/staging_vespalib/src/vespa/vespalib/metrics/mock_tick.cpp b/staging_vespalib/src/tests/metrics/mock_tick.cpp index e78b7c4644f..e78b7c4644f 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/mock_tick.cpp +++ b/staging_vespalib/src/tests/metrics/mock_tick.cpp diff --git a/staging_vespalib/src/vespa/vespalib/metrics/mock_tick.h b/staging_vespalib/src/tests/metrics/mock_tick.h index d9338cfea23..2f69f69fc91 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/mock_tick.h +++ b/staging_vespalib/src/tests/metrics/mock_tick.h @@ -1,11 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include "clock.h" - #include <atomic> #include <condition_variable> #include <mutex> +#include <vespa/vespalib/metrics/clock.h> namespace vespalib::metrics { @@ -29,4 +28,11 @@ public: TimeStamp waitUntilBlocked(); }; +struct TickProxy : Tick { + std::shared_ptr<Tick> tick; + TickProxy(std::shared_ptr<Tick> tick_in) : tick(std::move(tick_in)) {} + TimeStamp next(TimeStamp prev) override { return tick->next(prev); } + void kill() override { tick->kill(); } +}; + } // namespace vespalib::metrics diff --git a/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp b/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp index 6af03177ed8..80030cb89b2 100644 --- a/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp +++ b/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp @@ -6,7 +6,7 @@ #include <vespa/vespalib/metrics/simple_metrics_manager.h> #include <vespa/vespalib/metrics/stable_store.h> #include <vespa/vespalib/metrics/json_formatter.h> -#include <vespa/vespalib/metrics/mock_tick.h> +#include "mock_tick.h" #include <stdio.h> #include <unistd.h> diff --git a/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt index 6fec0900b06..34cc5453304 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt +++ b/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt @@ -17,7 +17,6 @@ vespa_add_library(staging_vespalib_vespalib_metrics OBJECT metric_name.cpp metrics_manager.cpp metric_types.cpp - mock_tick.cpp name_collection.cpp point_builder.cpp point.cpp diff --git a/staging_vespalib/src/vespa/vespalib/metrics/clock.h b/staging_vespalib/src/vespa/vespalib/metrics/clock.h index ae67b542fcd..d46c691b648 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/clock.h +++ b/staging_vespalib/src/vespa/vespalib/metrics/clock.h @@ -26,11 +26,4 @@ struct Tick { virtual ~Tick() {} }; -struct TickProxy : Tick { - std::shared_ptr<Tick> tick; - TickProxy(std::shared_ptr<Tick> tick_in) : tick(std::move(tick_in)) {} - TimeStamp next(TimeStamp prev) override { return tick->next(prev); } - void kill() override { tick->kill(); } -}; - } // namespace vespalib::metrics |