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/tests/test-data.cpp b/tests/test-data.cpp
index b5b2083..19241b5 100644
--- a/tests/test-data.cpp
+++ b/tests/test-data.cpp
@@ -118,7 +118,7 @@
BOOST_REQUIRE_EQUAL(d.getName().toUri(), "/local/ndn/prefix");
BOOST_REQUIRE_EQUAL(d.getContentType(), static_cast<uint32_t>(MetaInfo::TYPE_DEFAULT));
- BOOST_REQUIRE_EQUAL(d.getFreshnessPeriod(), 10000);
+ BOOST_REQUIRE_EQUAL(d.getFreshnessPeriod(), time::seconds(10));
BOOST_REQUIRE_EQUAL(std::string(reinterpret_cast<const char*>(d.getContent().value()), d.getContent().value_size()), "SUCCESS!");
@@ -143,7 +143,7 @@
ndn::Data d(ndn::Name("/local/ndn/prefix"));
d.setContentType(MetaInfo::TYPE_DEFAULT);
- d.setFreshnessPeriod(10000);
+ d.setFreshnessPeriod(time::seconds(10));
d.setContent(Content1, sizeof(Content1));
@@ -201,7 +201,7 @@
{
MetaInfo meta;
meta.setType(MetaInfo::TYPE_DEFAULT);
- meta.setFreshnessPeriod(10000);
+ meta.setFreshnessPeriod(time::seconds(10));
BOOST_REQUIRE_NO_THROW(meta.wireEncode());
BOOST_REQUIRE_EQUAL_COLLECTIONS(MetaInfo1, MetaInfo1+sizeof(MetaInfo1),
@@ -222,17 +222,17 @@
{
MetaInfo meta(Block(MetaInfo1, sizeof(MetaInfo1)));
BOOST_CHECK_EQUAL(meta.getType(), static_cast<uint32_t>(MetaInfo::TYPE_DEFAULT));
- BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), 10000);
+ BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), time::seconds(10));
BOOST_CHECK_EQUAL(meta.getFinalBlockId(), name::Component());
meta.wireDecode(Block(MetaInfo2, sizeof(MetaInfo2)));
BOOST_CHECK_EQUAL(meta.getType(), static_cast<uint32_t>(MetaInfo::TYPE_DEFAULT));
- BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), 10000);
+ BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), time::seconds(10));
BOOST_CHECK_EQUAL(meta.getFinalBlockId(), name::Component("hello,world!"));
meta.wireDecode(Block(MetaInfo3, sizeof(MetaInfo3)));
BOOST_CHECK_EQUAL(meta.getType(), static_cast<uint32_t>(MetaInfo::TYPE_LINK));
- BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), 10000);
+ BOOST_CHECK_EQUAL(meta.getFreshnessPeriod(), time::seconds(10));
BOOST_CHECK_EQUAL(meta.getFinalBlockId(), name::Component("hello,world!"));
}