diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-19 23:22:55 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-20 21:55:01 +0000 |
commit | cf3b20dba22718b533eac6854cde86b6538958af (patch) | |
tree | 9a0e795cd74d2721140c48012f794298dfef7420 /searchlib/src/tests/postinglistbm/stress_runner.cpp | |
parent | 64b7c822099d7cda921699e380c4d95608a1ab00 (diff) |
FastOS_Time -> std::chrono.
Diffstat (limited to 'searchlib/src/tests/postinglistbm/stress_runner.cpp')
-rw-r--r-- | searchlib/src/tests/postinglistbm/stress_runner.cpp | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/searchlib/src/tests/postinglistbm/stress_runner.cpp b/searchlib/src/tests/postinglistbm/stress_runner.cpp index a2a2968c13c..53b683cd7fd 100644 --- a/searchlib/src/tests/postinglistbm/stress_runner.cpp +++ b/searchlib/src/tests/postinglistbm/stress_runner.cpp @@ -3,16 +3,10 @@ #include "stress_runner.h" #include <vespa/fastos/thread.h> -#include <vespa/fastos/time.h> -#include <vespa/searchlib/common/bitvector.h> #include <vespa/searchlib/test/fakedata/fake_match_loop.h> -#include <vespa/searchlib/test/fakedata/fakeegcompr64filterocc.h> -#include <vespa/searchlib/test/fakedata/fakefilterocc.h> #include <vespa/searchlib/test/fakedata/fakeposting.h> #include <vespa/searchlib/test/fakedata/fakeword.h> #include <vespa/searchlib/test/fakedata/fakewordset.h> -#include <vespa/searchlib/test/fakedata/fakezcbfilterocc.h> -#include <vespa/searchlib/test/fakedata/fakezcfilterocc.h> #include <vespa/searchlib/test/fakedata/fpfactory.h> #include <condition_variable> #include <mutex> @@ -236,12 +230,8 @@ StressMaster::makePostingsHelper(FPFactory *postingFactory, const std::string &postingFormat, bool validate, bool verbose) { - FastOS_Time tv; - double before; - double after; + fastos::StopWatch tv; - tv.SetNow(); - before = tv.Secs(); postingFactory->setup(_wordSet); for (size_t i = 0; i < _wordSet.words().size(); ++i) makeSomePostings(postingFactory, @@ -249,11 +239,10 @@ StressMaster::makePostingsHelper(FPFactory *postingFactory, _stride, validate, verbose); - tv.SetNow(); - after = tv.Secs(); + LOG(info, "StressMaster::makePostingsHelper() elapsed %10.6f s for %s format", - after - before, + tv.elapsed().sec(), postingFormat.c_str()); } @@ -323,12 +312,8 @@ StressMaster::run() double StressMaster::runWorkers(const std::string &postingFormat) { - FastOS_Time tv; - double before; - double after; + fastos::StopWatch tv; - tv.SetNow(); - before = tv.Secs(); uint32_t numWorkers = 8; for (uint32_t i = 0; i < numWorkers; ++i) { if (_operatorType == StressRunner::OperatorType::Direct) { @@ -350,15 +335,14 @@ StressMaster::runWorkers(const std::string &postingFormat) _taskCond.wait(taskGuard); } } - tv.SetNow(); - after = tv.Secs(); + LOG(info, "StressMaster::run() elapsed %10.6f s for workers %s format", - after - before, + tv.elapsed().sec(), postingFormat.c_str()); _workers.clear(); _workersDone = 0; - return after - before; + return tv.elapsed().sec(); } StressWorker::StressWorker(StressMaster& master, uint32_t id) |