Ensure that we have stopped the thread.

2 files changed, 5 insertions, 4 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/util/clock.cpp b/staging_vespalib/src/vespa/vespalib/util/clock.cpp
index 0c7a9fe59ed..cd2a13029ab 100644
--- a/staging_vespalib/src/vespa/vespalib/util/clock.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/clock.cpp
@@ -41,9 +41,8 @@ Updater::Updater(Clock & clock, double timePeriod)
 Updater::~Updater() = default;
 
 void
-Updater::Run(FastOS_ThreadInterface *thread, void *arguments)
+Updater::Run(FastOS_ThreadInterface *thread, void *)
 {
-    (void) arguments;
     _clock._running = true;
     std::unique_lock<std::mutex> guard(_lock);
     while ( ! thread->GetBreakFlag() && !_stop) {
@@ -73,7 +72,9 @@ Clock::Clock(double timePeriod) :
 
 Clock::~Clock()
 {
-    _updater.reset();
+    if (_running) {
+        _updater->GetThread()->Join();
+    }
     assert(!_running);
 }
 
diff --git a/staging_vespalib/src/vespa/vespalib/util/clock.h b/staging_vespalib/src/vespa/vespalib/util/clock.h
index 61352cb6cdc..e9e1ebace3f 100644
--- a/staging_vespalib/src/vespa/vespalib/util/clock.h
+++ b/staging_vespalib/src/vespa/vespalib/util/clock.h
@@ -22,7 +22,7 @@ class Clock
 private:
     mutable std::atomic<int64_t>              _timeNS;
     std::unique_ptr<clock::internal::Updater> _updater;
-    bool                                      _running;
+    std::atomic<bool>                         _running;
 
     void setTime() const;
     void start();