commit 7c60329b07503fe8102b77d36dfe421363fc94a7
author Vince Lehman <vslehman@memphis.edu> Thu Sep 11 17:48:16 2014 -0500
committer Vince Lehman <vslehman@memphis.edu> Thu Sep 11 17:54:26 2014 -0500
tree 8f53611b68fae386bcfa51f24e45669d17ad7f9f
parent c0b97af1cce691f8be4bb67afd3fedd02f890f2a

src: Remove Scheduler instance from Nlsr class

refs: #1981

Change-Id: Iecbe9f975c2740ce04df8593ccde03486d4b7be8

src/lsdb.cpp

diff --git a/src/lsdb.cpp b/src/lsdb.cpp
index 74daed4..0490276 100644
--- a/src/lsdb.cpp
+++ b/src/lsdb.cpp
@@ -40,7 +40,7 @@
 void
 Lsdb::cancelScheduleLsaExpiringEvent(ndn::EventId eid)
 {
-  m_nlsr.getScheduler().cancelEvent(eid);
+  m_scheduler.cancelEvent(eid);
 }
 
 static bool
@@ -93,9 +93,8 @@
 Lsdb::scheduleNameLsaExpiration(const ndn::Name& key, int seqNo,
                                 const ndn::time::seconds& expTime)
 {
-  return m_nlsr.getScheduler().scheduleEvent(expTime + GRACE_PERIOD,
-                                             ndn::bind(&Lsdb::exprireOrRefreshNameLsa,
-                                                       this, key, seqNo));
+  return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
+                                   ndn::bind(&Lsdb::exprireOrRefreshNameLsa, this, key, seqNo));
 }
 
 bool
@@ -299,9 +298,9 @@
 Lsdb::scheduleCoordinateLsaExpiration(const ndn::Name& key, int seqNo,
                                       const ndn::time::seconds& expTime)
 {
-  return m_nlsr.getScheduler().scheduleEvent(expTime + GRACE_PERIOD,
-                                             ndn::bind(&Lsdb::exprireOrRefreshCoordinateLsa,
-                                                       this, key, seqNo));
+  return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
+                                   ndn::bind(&Lsdb::exprireOrRefreshCoordinateLsa,
+                                             this, key, seqNo));
 }
 
 bool
@@ -451,9 +450,8 @@
     m_nlsr.setIsBuildAdjLsaSheduled(true);
     int schedulingTime = m_nlsr.getConfParameter().getInterestRetryNumber() *
                          m_nlsr.getConfParameter().getInterestResendTime();
-    m_nlsr.getScheduler().scheduleEvent(ndn::time::seconds(schedulingTime),
-                                        ndn::bind(&Lsdb::scheduledAdjLsaBuild,
-                                                  this));
+    m_scheduler.scheduleEvent(ndn::time::seconds(schedulingTime),
+                              ndn::bind(&Lsdb::scheduledAdjLsaBuild, this));
   }
 }
 
@@ -505,9 +503,8 @@
 Lsdb::scheduleAdjLsaExpiration(const ndn::Name& key, int seqNo,
                                const ndn::time::seconds& expTime)
 {
-  return m_nlsr.getScheduler().scheduleEvent(expTime + GRACE_PERIOD,
-                                             ndn::bind(&Lsdb::exprireOrRefreshAdjLsa,
-                                                       this, key, seqNo));
+  return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
+                                   ndn::bind(&Lsdb::exprireOrRefreshAdjLsa, this, key, seqNo));
 }
 
 bool
@@ -952,9 +949,8 @@
   // Stop retrying if delayed re-validation will be scheduled pass the deadline
   if (steady_clock::now() + m_nlsr.getConfParameter().getLsaInterestLifetime() < deadline) {
     _LOG_DEBUG("Scheduling revalidation");
-    m_nlsr.getScheduler().scheduleEvent(m_nlsr.getConfParameter().getLsaInterestLifetime(),
-                                        ndn::bind(&Lsdb::retryContentValidation,
-                                                  this, data, deadline));
+    m_scheduler.scheduleEvent(m_nlsr.getConfParameter().getLsaInterestLifetime(),
+                              ndn::bind(&Lsdb::retryContentValidation, this, data, deadline));
   }
 }