diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-15 10:53:09 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-15 10:53:09 +0000 |
commit | 363603705abd5d0204531f1ac8e5eb84338c120f (patch) | |
tree | 46f2aafb36a81107ad6878a7e5661dac87b91eee /searchlib | |
parent | 5b2071b9f54c54cbc79225b27faf8ac645158e72 (diff) |
Use ClockSteady and return TimeStamp instead of untyped int64_t without unit.
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attributevector.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/engine/trace.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index 35f5d59bb5f..00f45575d17 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -138,7 +138,7 @@ void AttributeVector::updateStat(bool force) { onUpdateStat(); } else if (_nextStatUpdateTime < fastos::ClockSteady::now()) { onUpdateStat(); - _nextStatUpdateTime = fastos::ClockSteady::now() + 5ul * fastos::TimeStamp::SEC; + _nextStatUpdateTime = fastos::ClockSteady::now() + fastos::TimeStamp(5ul * fastos::TimeStamp::SEC); } } diff --git a/searchlib/src/vespa/searchlib/engine/trace.cpp b/searchlib/src/vespa/searchlib/engine/trace.cpp index d95d07e0e98..576b8dc92a5 100644 --- a/searchlib/src/vespa/searchlib/engine/trace.cpp +++ b/searchlib/src/vespa/searchlib/engine/trace.cpp @@ -3,12 +3,11 @@ #include "trace.h" #include <vespa/vespalib/data/slime/slime.h> -using namespace std::chrono; - namespace search::engine { -fastos::TimeStamp SteadyClock::now() const { - return duration_cast<nanoseconds>(steady_clock::now().time_since_epoch()).count(); +fastos::TimeStamp +SteadyClock::now() const { + return fastos::ClockSteady::now(); } RelativeTime::RelativeTime(std::unique_ptr<Clock> clock) |