Use std::chrono.

6 files changed, 32 insertions, 40 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index 069541eea91..1ad6b6cdc43 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -127,7 +127,7 @@ ViewSet::ViewSet()
       _dmsc(),
       _gidToLidChangeHandler(),
       _lidReuseDelayer(),
-      _commitTimeTracker(TimeStamp()),
+      _commitTimeTracker(vespalib::duration::zero()),
       searchView(),
       feedView(),
       _hwInfo()
@@ -256,7 +256,7 @@ struct MyFastAccessFeedView
           _dmsc(),
           _gidToLidChangeHandler(make_shared<DummyGidToLidChangeHandler>()),
           _lidReuseDelayer(),
-          _commitTimeTracker(TimeStamp()),
+          _commitTimeTracker(vespalib::duration::zero()),
           _feedView()
     {
         init();
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 839228b79b8..ca513cb1cfb 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -707,7 +707,7 @@ FixtureBase::FixtureBase(vespalib::duration visibilityDelay)
       _writeServiceReal(_sharedExecutor),
       _writeService(_writeServiceReal),
       _lidReuseDelayer(_writeService, _dmsc->get()),
-      _commitTimeTracker(vespalib::count_ns(visibilityDelay)),
+      _commitTimeTracker(visibilityDelay),
       serial(0),
       _gidToLidChangeHandler(std::make_shared<MyGidToLidChangeHandler>())
 {
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index 2d5f86fbc58..7c9df8d3e47 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -94,8 +94,7 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie
         MyMinimalFeedViewBase(),
         StoreOnlyFeedView(StoreOnlyFeedView::Context(summaryAdapter,
                           search::index::Schema::SP(),
-                          DocumentMetaStoreContext::SP(
-                                  new DocumentMetaStoreContext(metaStore)),
+                          std::make_shared<DocumentMetaStoreContext>(metaStore),
                                                      *gidToLidChangeHandler,
                                                      myGetDocumentTypeRepo(),
                                                      writeService,
@@ -109,23 +108,19 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie
         outstandingMoveOps(outstandingMoveOps_)
     {
     }
-    virtual void removeAttributes(SerialNum s, const LidVector &l,
-                                  bool immediateCommit, OnWriteDoneType onWriteDone) override {
+    void removeAttributes(SerialNum s, const LidVector &l, bool immediateCommit, OnWriteDoneType onWriteDone) override {
         StoreOnlyFeedView::removeAttributes(s, l, immediateCommit, onWriteDone);
         ++removeMultiAttributesCount;
     }
-    virtual void removeIndexedFields(SerialNum s, const LidVector &l,
-                                     bool immediateCommit,
-                                     OnWriteDoneType onWriteDone) override {
-        StoreOnlyFeedView::removeIndexedFields(s, l,
-                                               immediateCommit, onWriteDone);
+    void removeIndexedFields(SerialNum s, const LidVector &l, bool immediateCommit, OnWriteDoneType onWriteDone) override {
+        StoreOnlyFeedView::removeIndexedFields(s, l, immediateCommit, onWriteDone);
         ++removeMultiIndexFieldsCount;
     }
-    virtual void heartBeatIndexedFields(SerialNum s) override {
+    void heartBeatIndexedFields(SerialNum s) override {
         StoreOnlyFeedView::heartBeatIndexedFields(s);
         ++heartBeatIndexedFieldsCount;
     }
-    virtual void heartBeatAttributes(SerialNum s) override {
+    void heartBeatAttributes(SerialNum s) override {
         StoreOnlyFeedView::heartBeatAttributes(s);
         ++heartBeatAttributesCount;
     }
@@ -154,26 +149,23 @@ struct MoveOperationFeedView : public MyMinimalFeedView {
             removeIndexFieldsCount(0),
             onWriteDoneContexts()
     {}
-    virtual void putAttributes(SerialNum, search::DocumentIdT, const document::Document &,
-                               bool, OnPutDoneType onWriteDone) override {
+    void putAttributes(SerialNum, search::DocumentIdT, const document::Document &, bool, OnPutDoneType onWriteDone) override {
         ++putAttributesCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         onWriteDoneContexts.push_back(onWriteDone);
     }
-    virtual void putIndexedFields(SerialNum, search::DocumentIdT, const document::Document::SP &,
-                                  bool, OnOperationDoneType onWriteDone) override {
+     void putIndexedFields(SerialNum, search::DocumentIdT, const document::Document::SP &,
+                           bool, OnOperationDoneType onWriteDone) override {
         ++putIndexFieldsCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         onWriteDoneContexts.push_back(onWriteDone);
     }
-    virtual void removeAttributes(SerialNum, search::DocumentIdT,
-                                  bool, OnRemoveDoneType onWriteDone) override {
+    void removeAttributes(SerialNum, search::DocumentIdT, bool, OnRemoveDoneType onWriteDone) override {
         ++removeAttributesCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         onWriteDoneContexts.push_back(onWriteDone);
     }
-    virtual void removeIndexedFields(SerialNum, search::DocumentIdT,
-                                     bool, OnRemoveDoneType onWriteDone) override {
+    void removeIndexedFields(SerialNum, search::DocumentIdT, bool, OnRemoveDoneType onWriteDone) override {
         ++removeIndexFieldsCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         onWriteDoneContexts.push_back(onWriteDone);
@@ -186,7 +178,7 @@ struct MoveOperationCallback : public IDestructorCallback {
     MoveOperationCallback(int &outstandingMoveOps_) : outstandingMoveOps(outstandingMoveOps_) {
         ++outstandingMoveOps;
     }
-    virtual ~MoveOperationCallback() {
+    ~MoveOperationCallback() override {
         ASSERT_GREATER(outstandingMoveOps, 0);
         --outstandingMoveOps;
     }
@@ -220,7 +212,7 @@ struct FixtureBase {
           sharedExecutor(1, 0x10000),
           writeService(sharedExecutor),
           lidReuseDelayer(writeService, *metaStore),
-          commitTimeTracker(fastos::TimeStamp()),
+          commitTimeTracker(vespalib::duration::zero()),
           feedview()
     {
         StoreOnlyFeedView::PersistentParams params(0, 0, DocTypeName("foo"), subdb_id, subDbType);
diff --git a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp
index c9db3d23979..eaf515d4fa5 100644
--- a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp
@@ -4,9 +4,9 @@
 
 namespace proton {
 
-CommitTimeTracker::CommitTimeTracker(fastos::TimeStamp visibilityDelay)
+CommitTimeTracker::CommitTimeTracker(vespalib::duration visibilityDelay)
     : _visibilityDelay(visibilityDelay),
-      _nextCommit(fastos::ClockSteady::now()),
+      _nextCommit(vespalib::steady_clock::now()),
       _replayDone(false)
 {
     _nextCommit = _nextCommit + visibilityDelay;
@@ -15,11 +15,11 @@ CommitTimeTracker::CommitTimeTracker(fastos::TimeStamp visibilityDelay)
 bool
 CommitTimeTracker::needCommit() const
 {
-    if (_visibilityDelay > 0) {
+    if (hasVisibilityDelay()) {
         if (_replayDone) {
             return false; // maintenance job will do forced commits now
         }
-        fastos::SteadyTimeStamp now(fastos::ClockSteady::now());
+        vespalib::steady_time now(vespalib::steady_clock::now());
         if (now > _nextCommit) {
             _nextCommit = now + _visibilityDelay;
             return true;
@@ -30,13 +30,13 @@ CommitTimeTracker::needCommit() const
 }
 
 void
-CommitTimeTracker::setVisibilityDelay(fastos::TimeStamp visibilityDelay)
+CommitTimeTracker::setVisibilityDelay(vespalib::duration visibilityDelay)
 {
-    fastos::SteadyTimeStamp nextCommit = fastos::ClockSteady::now() + visibilityDelay;
+    vespalib::steady_time nextCommit = vespalib::steady_clock::now() + visibilityDelay;
     if (nextCommit < _nextCommit) {
         _nextCommit = nextCommit;
     }
     _visibilityDelay = visibilityDelay;
 }
 
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
index d00152cf372..02bf87f0a08 100644
--- a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/fastos/timestamp.h>
+#include <vespa/vespalib/util/time.h>
 
 namespace proton {
 
@@ -11,18 +11,18 @@ namespace proton {
 class CommitTimeTracker
 {
 private:
-    fastos::TimeStamp                _visibilityDelay;
-    mutable fastos::SteadyTimeStamp  _nextCommit;
-    bool                             _replayDone;
+    vespalib::duration             _visibilityDelay;
+    mutable vespalib::steady_time  _nextCommit;
+    bool                           _replayDone;
 
 public:
-    CommitTimeTracker(fastos::TimeStamp visibilityDelay);
+    CommitTimeTracker(vespalib::duration visibilityDelay);
 
     bool needCommit() const;
 
-    void setVisibilityDelay(fastos::TimeStamp visibilityDelay);
+    void setVisibilityDelay(vespalib::duration visibilityDelay);
 
-    bool hasVisibilityDelay() const { return _visibilityDelay != 0; }
+    bool hasVisibilityDelay() const { return _visibilityDelay != vespalib::duration::zero(); }
 
     void setReplayDone() { _replayDone = true; }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 609982a46d5..44d3e618b93 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -125,7 +125,7 @@ StoreOnlyDocSubDB::StoreOnlyDocSubDB(const Config &cfg, const Context &ctx)
       _subDbType(cfg._subDbType),
       _fileHeaderContext(*this, ctx._fileHeaderContext, _docTypeName, _baseDir),
       _lidReuseDelayer(),
-      _commitTimeTracker(TimeStamp::Seconds(3600.0)),
+      _commitTimeTracker(vespalib::from_s(3600)),
       _gidToLidChangeHandler(std::make_shared<DummyGidToLidChangeHandler>())
 {
     vespalib::mkdir(_baseDir, false); // Assume parent is created.
@@ -401,7 +401,7 @@ StoreOnlyDocSubDB::updateLidReuseDelayer(const LidReuseDelayerConfig &config)
      * feed view before applying the new config to the sub dbs.
      */
     _lidReuseDelayer->setImmediateCommit(immediateCommit);
-    _commitTimeTracker.setVisibilityDelay(config.visibilityDelay());
+    _commitTimeTracker.setVisibilityDelay(vespalib::from_s(config.visibilityDelay()));
 }
 
 IReprocessingTask::List