Unify on vespalib time functions.

2 files changed, 8 insertions, 10 deletions

diff --git a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
index c3a40e00e37..e06100bc0bb 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domain.cpp
@@ -462,7 +462,7 @@ Domain::startSession(int sessionId)
     std::lock_guard guard(_sessionLock);
     SessionList::iterator found = _sessions.find(sessionId);
     if (found != _sessions.end()) {
-        found->second->setStartTime(std::chrono::steady_clock::now());
+        found->second->setStartTime(vespalib::steady_clock::now());
         if ( execute(Session::createTask(found->second)).get() == nullptr ) {
             retval = 0;
         } else {
@@ -482,7 +482,7 @@ Domain::closeSession(int sessionId)
         std::lock_guard guard(_sessionLock);
         SessionList::iterator found = _sessions.find(sessionId);
         if (found != _sessions.end()) {
-            sessionRunTime = (std::chrono::steady_clock::now() - found->second->getStartTime());
+            sessionRunTime = (vespalib::steady_clock::now() - found->second->getStartTime());
             retval = 1;
         }
     }
@@ -528,7 +528,7 @@ Domain::scanDir()
         if (ename[wantPrefixLen] != '-')
             continue;
         const char *p = ename + wantPrefixLen + 1;
-        uint64_t num = strtoull(p, NULL, 10);
+        uint64_t num = strtoull(p, nullptr, 10);
         string checkName = fmt("%s-%016" PRIu64, _name.c_str(), num);
         if (strcmp(checkName.c_str(), ename) != 0)
             continue;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/session.h b/searchlib/src/vespa/searchlib/transactionlog/session.h
index a1f7440525d..3e55387b81c 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/session.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/session.h
@@ -3,8 +3,6 @@
 
 #include "common.h"
 #include <vespa/vespalib/util/executor.h>
-#include <chrono>
-#include <deque>
 #include <atomic>
 
 class FastOS_FileInterface;
@@ -19,10 +17,10 @@ class Session
 {
 private:
     using Task = vespalib::Executor::Task;
-    using time_point = std::chrono::time_point<std::chrono::steady_clock>;
+    using steady_time = vespalib::steady_time;
 
 public:
-    typedef std::shared_ptr<Session> SP;
+    using SP = std::shared_ptr<Session>;
     Session(const Session &) = delete;
     Session & operator = (const Session &) = delete;
     Session(int sId, const SerialNumRange & r, const DomainSP & d, std::unique_ptr<Destination> destination);
@@ -32,8 +30,8 @@ public:
     bool inSync()    const { return _inSync; }
     bool finished()  const;
     static Task::UP createTask(const Session::SP & session);
-    void setStartTime(time_point startTime) { _startTime = startTime; }
-    time_point getStartTime() const { return _startTime; }
+    void setStartTime(steady_time startTime) { _startTime = startTime; }
+    steady_time getStartTime() const { return _startTime; }
     bool isVisitRunning() const { return _visitRunning; }
 private:
     class VisitTask : public Task {
@@ -60,7 +58,7 @@ private:
     std::atomic<bool>            _visitRunning;
     std::atomic<bool>            _inSync;
     std::atomic<bool>            _finished;
-    time_point                   _startTime;
+    steady_time                  _startTime;
 };
 
 }