Add typesafe SteadyTimeStamp.

3 files changed, 17 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
index 63eff02408c..478cf0b2f98 100644
--- a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
+++ b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
@@ -289,7 +289,7 @@ TEST("require that the match phase limiter is able to pre-limit the query") {
     MaybeMatchPhaseLimiter &limiter = yes_limiter;
     EXPECT_TRUE(limiter.is_enabled());
     EXPECT_EQUAL(12u, limiter.sample_hits_per_thread(10));
-    RelativeTime clock(std::make_unique<CountingClock>(fastos::TimeStamp::fromSec(1500000000), 1700000L));
+    RelativeTime clock(std::make_unique<CountingClock>(fastos::TimeStamp::fromSec(10000000), 1700000L));
     Trace trace(clock, 7);
     trace.start(4);
     SearchIterator::UP search = limiter.maybe_limit(prepare(new MockSearch("search")), 0.1, 100000, trace.maybeCreateCursor(7, "limit"));
@@ -315,7 +315,7 @@ TEST("require that the match phase limiter is able to pre-limit the query") {
     trace.done();
     verify(
         "{"
-        "    start_time_utc: '2017-07-14 02:40:00.000 UTC',"
+        "    start_time_relative: '1970-04-26 17:46:40.000 UTC',"
         "    traces: ["
         "        {"
         "            timestamp_ms: 1.7,"
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 05ca9e758ab..883aa8f5aa5 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -60,6 +60,13 @@ using vespalib::nbostream;
 using vespalib::eval::TensorSpec;
 using vespalib::tensor::DefaultTensorEngine;
 
+namespace fastos {
+    std::ostream &
+    operator<<(std::ostream &os, SteadyTimeStamp ts) {
+        return os << ts.toString();
+    }
+}
+
 void inject_match_phase_limiting(Properties &setup, const vespalib::string &attribute, size_t max_hits, bool descending)
 {
     Properties cfg;
@@ -767,7 +774,7 @@ TEST("require that getSummaryFeatures prefers cached query setup") {
     ASSERT_EQUAL(0u, fs->numDocs());  // "spread" has no hits
 
     // Empty cache
-    auto pruneTime = fastos::ClockSystem::now() +
+    auto pruneTime = fastos::ClockSteady::now() +
                      fastos::TimeStamp::MINUTE * 10;
     world.sessionManager->pruneTimedOutSessions(pruneTime);
 
diff --git a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
index 78fe216cb9e..5998b165b51 100644
--- a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
+++ b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp
@@ -18,6 +18,7 @@ using vespalib::string;
 using namespace proton;
 using namespace proton::matching;
 using vespalib::StateExplorer;
+using fastos::SteadyTimeStamp;
 
 namespace {
 
@@ -34,8 +35,8 @@ void checkStats(SessionManager::Stats stats, uint32_t numInsert,
 
 TEST("require that SessionManager handles SearchSessions.") {
     string session_id("foo");
-    fastos::TimeStamp start(100);
-    fastos::TimeStamp doom(1000);
+    SteadyTimeStamp start(100);
+    SteadyTimeStamp doom(1000);
     MatchToolsFactory::UP mtf;
     SearchSession::OwnershipBundle owned_objects;
     auto session = std::make_shared<SearchSession>(session_id, start, doom, std::move(mtf), std::move(owned_objects));
@@ -49,9 +50,9 @@ TEST("require that SessionManager handles SearchSessions.") {
     TEST_DO(checkStats(session_manager.getSearchStats(), 0, 1, 0, 1, 0));
     session_manager.insert(std::move(session));
     TEST_DO(checkStats(session_manager.getSearchStats(), 1, 0, 0, 1, 0));
-    session_manager.pruneTimedOutSessions(500);
+    session_manager.pruneTimedOutSessions(SteadyTimeStamp(500));
     TEST_DO(checkStats(session_manager.getSearchStats(), 0, 0, 0, 1, 0));
-    session_manager.pruneTimedOutSessions(2000);
+    session_manager.pruneTimedOutSessions(SteadyTimeStamp(2000));
     TEST_DO(checkStats(session_manager.getSearchStats(), 0, 0, 0, 0, 1));
 
     session = session_manager.pickSearch(session_id);
@@ -59,8 +60,8 @@ TEST("require that SessionManager handles SearchSessions.") {
 }
 
 TEST("require that SessionManager can be explored") {
-    fastos::TimeStamp start(100);
-    fastos::TimeStamp doom(1000);
+    SteadyTimeStamp start(100);
+    SteadyTimeStamp doom(1000);
     SessionManager session_manager(10);
     session_manager.insert(std::make_shared<SearchSession>("foo", start, doom,
                                                            MatchToolsFactory::UP(), SearchSession::OwnershipBundle()));