From 9156592055b871be41b1f634ee37842854dc73a4 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 6 Dec 2019 20:17:56 +0000 Subject: Use std::chrono. --- .../queryeval/simple_phrase/simple_phrase_test.cpp | 6 +++--- .../sparse_vector_benchmark_test.cpp | 22 +++++++++++----------- .../tests/queryeval/weak_and/wand_bench_setup.hpp | 13 ++++++------- 3 files changed, 20 insertions(+), 21 deletions(-) (limited to 'searchlib/src/tests/queryeval') diff --git a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp index bf1b5352778..0743ac8408d 100644 --- a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp +++ b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp @@ -170,7 +170,7 @@ public: }; PhraseSearchTest::PhraseSearchTest(bool expiredDoom) - : _requestContext(nullptr, expiredDoom ? fastos::SteadyTimeStamp::ZERO : fastos::SteadyTimeStamp::FUTURE), + : _requestContext(nullptr, expiredDoom ? vespalib::steady_time(): vespalib::steady_time::max()), _index(), _phrase_fs(field, fieldId, phrase_handle), _phrase(_phrase_fs, _requestContext, false), @@ -199,7 +199,7 @@ void Test::requireThatIteratorHonorsFutureDoom() { test.fetchPostings(false); vespalib::Clock clock; - vespalib::Doom futureDoom(clock, fastos::SteadyTimeStamp::FUTURE); + vespalib::Doom futureDoom(clock, vespalib::steady_time::max()); unique_ptr search(test.createSearch(false)); static_cast(*search).setDoom(&futureDoom); EXPECT_TRUE(!search->seek(1u)); @@ -213,7 +213,7 @@ void Test::requireThatIteratorHonorsDoom() { test.fetchPostings(false); vespalib::Clock clock; - vespalib::Doom futureDoom(clock, fastos::SteadyTimeStamp::ZERO); + vespalib::Doom futureDoom(clock, vespalib::steady_time()); unique_ptr search(test.createSearch(false)); static_cast(*search).setDoom(&futureDoom); EXPECT_TRUE(!search->seek(1u)); diff --git a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp index 7d2efc5f2bc..3b61aaaac3e 100644 --- a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp +++ b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp @@ -131,8 +131,8 @@ int Plot::_plots = 0; //----------------------------------------------------------------------------- -uint32_t default_weight = 100; -double max_time = 1000000.0; +constexpr uint32_t default_weight = 100; +constexpr vespalib::duration max_time = 1000s; //----------------------------------------------------------------------------- @@ -312,20 +312,20 @@ struct NegativeFilterAfterStrategy : FilterStrategy { //----------------------------------------------------------------------------- struct Result { - double time_ms; + vespalib::duration time; uint32_t num_hits; - Result() : time_ms(max_time), num_hits(0) {} - Result(double t, uint32_t n) : time_ms(t), num_hits(n) {} + Result() : time(max_time), num_hits(0) {} + Result(vespalib::duration t, uint32_t n) : time(t), num_hits(n) {} void combine(const Result &r) { - if (time_ms == max_time) { + if (time == max_time) { *this = r; } else { assert(num_hits == r.num_hits); - time_ms = std::min(time_ms, r.time_ms); + time = std::min(time, r.time); } } std::string toString() const { - return vespalib::make_string("%u hits, %g ms", num_hits, time_ms); + return vespalib::make_string("%u hits, %ld ms", num_hits, vespalib::count_ms(time)); } }; @@ -333,12 +333,12 @@ Result run_single_benchmark(FilterStrategy &filterStrategy, SparseVectorFactory SearchIterator::UP search(filterStrategy.createRoot(vectorFactory, childFactory, childCnt, limit)); SearchIterator &sb = *search; uint32_t num_hits = 0; - fastos::StopWatch timer; + vespalib::Timer timer; for (sb.seek(1); !sb.isAtEnd(); sb.seek(sb.getDocId() + 1)) { ++num_hits; sb.unpack(sb.getDocId()); } - return Result(timer.elapsed().ms(), num_hits); + return Result(timer.elapsed(), num_hits); } //----------------------------------------------------------------------------- @@ -371,7 +371,7 @@ public: for (int j = 0; j < 5; ++j) { result.combine(run_single_benchmark(_filterStrategy, svf, _childFactory, childCnt, _limit)); } - graph->addValue(childCnt, result.time_ms); + graph->addValue(childCnt, vespalib::count_ms(result.time)); fprintf(stderr, " %u children => %s\n", childCnt, result.toString().c_str()); } } diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp index 65890f81e16..576c9abe249 100644 --- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp +++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp @@ -187,22 +187,21 @@ struct FilterFactory : WandFactory { struct Setup { Stats stats; - double minTimeMs; - Setup() : stats(), minTimeMs(10000000.0) {} + vespalib::duration minTime; + Setup() : stats(), minTime(10000s) {} virtual ~Setup() {} virtual std::string name() const = 0; virtual SearchIterator::UP create() = 0; void perform() { SearchIterator::UP search = create(); SearchIterator &sb = *search; - fastos::StopWatch timer; + vespalib::Timer timer; for (sb.seek(1); !sb.isAtEnd(); sb.seek(sb.getDocId() + 1)) { stats.hit(); sb.unpack(sb.getDocId()); } - double ms = timer.elapsed().ms(); - if (ms < minTimeMs) { - minTimeMs = ms; + if (timer.elapsed() < minTime) { + minTime = timer.elapsed(); } } void benchmark() { @@ -213,7 +212,7 @@ struct Setup { stats.print(); } } - fprintf(stderr, "time (ms): %g\n", minTimeMs); + fprintf(stderr, "time (ms): %ld\n", vespalib::count_ms(minTime)); } }; -- cgit v1.2.3