commit 86edf6fdc921b2adf5163be634d13d463092cc27
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Fri Nov 14 19:27:18 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 06 14:33:22 2015 -0800
tree b5ef85f85295f9739fab6a694e0fe8d4c59c2a45
parent 34e13f3287acbd5cbd5db19f0de5a1cd33eaea80

utils: Enable use of the simulation time in NFD

Conversion of ndnSIM time to system_clock::time_point, steady_clock::time_point, so that NFD use the simulation time.

helper/ndn-stack-helper.cpp

diff --git a/helper/ndn-stack-helper.cpp b/helper/ndn-stack-helper.cpp
index bd2413e..5d3dcd2 100644
--- a/helper/ndn-stack-helper.cpp
+++ b/helper/ndn-stack-helper.cpp
@@ -61,6 +61,8 @@
   : m_limitsEnabled(false)
   , m_needSetDefaultRoutes(false)
 {
+  setCustomNdnCxxClocks();
+
   m_ndnFactory.SetTypeId("ns3::ndn::L3Protocol");
   m_strategyFactory.SetTypeId("ns3::ndn::fw::Flooding");
   m_contentStoreFactory.SetTypeId("ns3::ndn::cs::Lru");
@@ -85,6 +87,13 @@
 }
 
 void
+StackHelper::setCustomNdnCxxClocks()
+{
+  ::ndn::time::setCustomClocks(make_shared<ns3::ndn::time::CustomSteadyClock>(),
+                               make_shared<ns3::ndn::time::CustomSystemClock>());
+}
+
+void
 StackHelper::SetStackAttributes(const std::string& attr1, const std::string& value1,
                                 const std::string& attr2, const std::string& value2,
                                 const std::string& attr3, const std::string& value3,

helper/ndn-stack-helper.hpp

diff --git a/helper/ndn-stack-helper.hpp b/helper/ndn-stack-helper.hpp
index afc43dc..b6b4266 100644
--- a/helper/ndn-stack-helper.hpp
+++ b/helper/ndn-stack-helper.hpp
@@ -303,6 +303,10 @@
   PointToPointNetDeviceCallback(Ptr<Node> node, Ptr<L3Protocol> ndn,
                                 Ptr<NetDevice> netDevice) const;
 
+public:
+  void
+  setCustomNdnCxxClocks();
+
 private:
   StackHelper(const StackHelper&);
   StackHelper&