Drop all of TimeStamp too.

3 files changed, 9 insertions, 8 deletions

diff --git a/searchlib/src/tests/grouping/grouping_test.cpp b/searchlib/src/tests/grouping/grouping_test.cpp
index 4c94e4a2641..94d3afd619b 100644
--- a/searchlib/src/tests/grouping/grouping_test.cpp
+++ b/searchlib/src/tests/grouping/grouping_test.cpp
@@ -1896,7 +1896,7 @@ Test::testNanSorting()
     EXPECT_FALSE(0.2 < myNan);
     EXPECT_FALSE(0.2 > myNan);
 
-    fastos::Timer timer;
+    vespalib::Timer timer;
     std::vector<double> groups;
     while (timer.elapsed() < 60s) {
         std::vector<double> vec;
diff --git a/searchlib/src/vespa/searchlib/engine/trace.cpp b/searchlib/src/vespa/searchlib/engine/trace.cpp
index 95d6c967369..705bd5782ab 100644
--- a/searchlib/src/vespa/searchlib/engine/trace.cpp
+++ b/searchlib/src/vespa/searchlib/engine/trace.cpp
@@ -39,10 +39,11 @@ Trace::Trace(const RelativeTime & relativeTime, uint32_t level)
 void
 Trace::start(int level, bool useUTC) {
     if (shouldTrace(level) && !hasTrace()) {
-        vespalib::duration since_epoch = useUTC
-                ? vespalib::to_utc(_relativeTime.timeOfDawn()).time_since_epoch()
-                : _relativeTime.timeOfDawn().time_since_epoch();
-        root().setString("start_time", fastos::TimeStamp::asString(vespalib::to_s(since_epoch)));
+        if (useUTC) {
+            root().setString("start_time", vespalib::to_string(vespalib::to_utc(_relativeTime.timeOfDawn())));
+        } else {
+            root().setString("start_time", vespalib::to_string(_relativeTime.timeOfDawn()));
+        }
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
index 2cb546395d3..b88133c0bf9 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
@@ -2,8 +2,8 @@
 
 #include "trans_log_server_explorer.h"
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/util/time.h>
 #include <vespa/fastos/file.h>
-#include <vespa/fastos/timestamp.h>
 
 
 using vespalib::slime::Inserter;
@@ -16,7 +16,7 @@ namespace {
 struct DomainExplorer : vespalib::StateExplorer {
     Domain::SP domain;
     DomainExplorer(Domain::SP domain_in) : domain(std::move(domain_in)) {}
-    virtual void get_state(const Inserter &inserter, bool full) const override {
+    void get_state(const Inserter &inserter, bool full) const override {
         Cursor &state = inserter.insertObject();
         DomainInfo info = domain->getDomainInfo();
         state.setLong("from", info.range.from());
@@ -35,7 +35,7 @@ struct DomainExplorer : vespalib::StateExplorer {
                 {
                     FastOS_StatInfo stat_info;
                     FastOS_File::Stat(part_in.file.c_str(), &stat_info);
-                    part.setString("lastModified", fastos::TimeStamp::asString(stat_info._modifiedTime));
+                    part.setString("lastModified", vespalib::to_string(std::chrono::nanoseconds(stat_info._modifiedTimeNS)));
                 }
             }
         }