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/util/scheduler.hpp b/src/util/scheduler.hpp
index 18c3004..b7364ce 100644
--- a/src/util/scheduler.hpp
+++ b/src/util/scheduler.hpp
@@ -33,7 +33,7 @@
* \returns EventId that can be used to cancel the scheduled event
*/
EventId
- scheduleEvent(const time::Duration& after, const Event& event);
+ scheduleEvent(const time::nanoseconds& after, const Event& event);
/**
* \brief Schedule periodic event that should be fired every specified period.
@@ -41,8 +41,8 @@
* \returns EventId that can be used to cancel the scheduled event
*/
EventId
- schedulePeriodicEvent(const time::Duration& after,
- const time::Duration& period,
+ schedulePeriodicEvent(const time::nanoseconds& after,
+ const time::nanoseconds& period,
const Event& event);
/**
@@ -60,10 +60,11 @@
struct EventInfo
{
- EventInfo(const time::Duration& after,
- const time::Duration& period,
+ EventInfo(const time::nanoseconds& after,
+ const time::nanoseconds& period,
const Event& event);
- EventInfo(const time::Point& when, const EventInfo& previousEvent);
+
+ EventInfo(const time::steady_clock::TimePoint& when, const EventInfo& previousEvent);
bool
operator <=(const EventInfo& other) const
@@ -77,11 +78,11 @@
return this->m_scheduledTime < other.m_scheduledTime;
}
- time::Duration
+ time::nanoseconds
expiresFromNow() const;
- time::Point m_scheduledTime;
- time::Duration m_period;
+ time::steady_clock::TimePoint m_scheduledTime;
+ time::nanoseconds m_period;
Event m_event;
mutable EventId m_eventId;
};
@@ -91,7 +92,7 @@
EventQueue m_events;
EventQueue::iterator m_scheduledEvent;
- boost::asio::monotonic_deadline_timer m_deadlineTimer;
+ monotonic_deadline_timer m_deadlineTimer;
bool m_isEventExecuting;
};