all: Refactoring work with time using boost::chrono
Now the library has two clocks: time::steady_clock and
time::system_clock, following (boost|std)::chrono. In addition to
standard now() method, the library contains several helpers to convert
to/from UnixTimestamp (microsecond resolution) and IsoString (optional
microsecond resolution). The IsoString conversions use
boost::posix_time routines, since boost::chrono supports extended IO
support only starting boost version 1.52 (Boost Chrono V2).
This commit breaks compatibility with previous API. All time-related
Data/Interest calls must explicitly use time units to specify
FreshnessPeriod/InterestLifetime.
Brief usage/conversion guide:
- creation of time units does not support double/float types. If
necessary to create time unit from double, ``ndn::duration<double>`` (for
seconds) needs to be used instead. In some cases, this would also
require ``ndn::duration_cast``, if the target is not ``ndn::nanoseconds``.
- ndn::getNow, ndn::ndn_getNowMilliseconds, ndn::time::now are all
removed in favor of the now() method in a specific clock:
* time::system_clock::now();
* time::steady_clock::now();
- When necessary to convert system_clock::TimePoint to unix timestamp,
``time::toUnixTimestamp`` can be used. This method return number of
milliseconds since UNIX epoch as ``ndn::time::milliseconds`` type.
Use count() method to obtain number as an integral value.
Change-Id: Icd688bc6766e008d60c3d2888173627874526e47
Refs: #1152
diff --git a/src/detail/pending-interest.hpp b/src/detail/pending-interest.hpp
index b53dc1f..4cfc48a 100644
--- a/src/detail/pending-interest.hpp
+++ b/src/detail/pending-interest.hpp
@@ -30,15 +30,10 @@
: interest_(interest),
onData_(onData), onTimeout_(onTimeout)
{
- // Set up timeoutTime_.
- if (interest_->getInterestLifetime() >= 0)
- timeoutTimeMilliseconds_ = getNowMilliseconds() + interest_->getInterestLifetime();
+ if (interest_->getInterestLifetime() >= time::milliseconds::zero())
+ timeout_ = time::steady_clock::now() + interest_->getInterestLifetime();
else
- // No timeout.
- /**
- * @todo Set more meaningful default timeout. This timeout MUST exist.
- */
- timeoutTimeMilliseconds_ = getNowMilliseconds() + 4000;
+ timeout_ = time::steady_clock::now() + DEFAULT_INTEREST_LIFETIME;
}
const shared_ptr<const Interest>&
@@ -55,13 +50,12 @@
/**
* Check if this interest is timed out.
- * @param nowMilliseconds The current time in milliseconds from getNowMilliseconds.
* @return true if this interest timed out, otherwise false.
*/
bool
- isTimedOut(MillisecondsSince1970 nowMilliseconds)
+ isTimedOut(const time::steady_clock::TimePoint& now)
{
- return timeoutTimeMilliseconds_ >= 0.0 && nowMilliseconds >= timeoutTimeMilliseconds_;
+ return now >= timeout_;
}
/**
@@ -80,8 +74,8 @@
const OnData onData_;
const OnTimeout onTimeout_;
- /** The time when the interest times out in milliseconds according to getNowMilliseconds, or -1 for no timeout. */
- MillisecondsSince1970 timeoutTimeMilliseconds_;
+ /** The time when the interest times out in time::milliseconds according to getNowMilliseconds, or -1 for no timeout. */
+ time::steady_clock::TimePoint timeout_;
};