Use std::chrono::steady::clock

2 files changed, 6 insertions, 24 deletions

diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
index 78efc1f7429..667220777eb 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.cpp
@@ -3,29 +3,18 @@
 #include "appcontext.h"
 #include <cassert>
 
-FastS_TimeKeeper::FastS_TimeKeeper()
-    : _clock(0.010),
-      _thread_pool(128 * 1024)
-{
-    bool ok = _thread_pool.NewThread(&_clock);
-    assert(ok);
-    (void) ok;
-}
-
-
-FastS_TimeKeeper::~FastS_TimeKeeper()
-{
-    _clock.stop();
-    _thread_pool.Close();
+double FastS_TimeKeeper::GetTime() const {
+    using clock = std::chrono::steady_clock;
+    using seconds = std::chrono::duration<double, std::ratio<1,1>>;
+    return std::chrono::duration_cast<seconds>(clock::now().time_since_epoch()).count();
 }
 
 //---------------------------------------------------------------------
 
 FastS_AppContext::FastS_AppContext()
     : _timeKeeper(),
-      _createTime()
+      _createTime(_timeKeeper.GetTime())
 {
-    _createTime = _timeKeeper.GetTime();
 }
 
 FastS_AppContext::~FastS_AppContext() = default;
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
index fce468b4532..c018b3795b8 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
@@ -12,15 +12,8 @@ class FastS_DataSetCollection;
 
 class FastS_TimeKeeper
 {
-private:
-    vespalib::Clock   _clock;
-    FastOS_ThreadPool _thread_pool;
-
 public:
-    FastS_TimeKeeper();
-    ~FastS_TimeKeeper();
-
-    double GetTime() const { return _clock.getTimeNSAssumeRunning().sec(); }
+    double GetTime() const;
 };