update metrics library after review

* move ticker kill
* use relaxed JSON in test
* rewrite loops in MockTick
* no need for atomics when protected by mutex
* add alive() to Tick API
* hook up total metrics
* add some documentation comments

1 files changed, 5 insertions, 3 deletions

diff --git a/staging_vespalib/src/tests/metrics/mock_tick.h b/staging_vespalib/src/tests/metrics/mock_tick.h
index 2f69f69fc91..e0336260880 100644
--- a/staging_vespalib/src/tests/metrics/mock_tick.h
+++ b/staging_vespalib/src/tests/metrics/mock_tick.h
@@ -12,9 +12,9 @@ namespace vespalib::metrics {
 class MockTick : public Tick {
 private:
     std::mutex _lock;
-    std::atomic<bool> _runFlag;
-    std::atomic<bool> _provided;
-    std::atomic<bool> _blocked;
+    bool _runFlag;
+    bool _provided;
+    bool _blocked;
     std::condition_variable _providedCond;
     std::condition_variable _blockedCond;
     TimeStamp _nextValue;
@@ -23,6 +23,7 @@ public:
     MockTick();
     TimeStamp next(TimeStamp prev) override;
     void kill() override;
+    bool alive() override;
 
     void provide(TimeStamp value);
     TimeStamp waitUntilBlocked();
@@ -33,6 +34,7 @@ struct TickProxy : 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(); }
+    bool alive() override { return tick->alive(); }
 };
 
 } // namespace vespalib::metrics