commit 50526283074def1e0af62af88fe3664c86d29915
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 26 13:43:57 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 26 13:43:57 2013 -0800
tree 5edf260b6868042ff09689c390ae9fb6b21d4452
parent 30ef922b35526f5fd51398a9d60ab7e895a810fb

Experimental things with scheduling syncInterests in sync-core

src/sync-core.cc

diff --git a/src/sync-core.cc b/src/sync-core.cc
index 4ad99c3..191b92b 100644
--- a/src/sync-core.cc
+++ b/src/sync-core.cc
@@ -35,6 +35,9 @@
 const double SyncCore::WAIT = 0.05;
 const double SyncCore::RANDOM_PERCENT = 0.5;
 
+const std::string SYNC_INTEREST_TAG = "send-sync-interest";
+const std::string SYNC_INTEREST_TAG2 = "send-sync-interest2";
+
 using namespace boost;
 using namespace Ccnx;
 
@@ -55,10 +58,11 @@
   m_log->UpdateLocalLocator (localPrefix);
 
   m_scheduler->start();
-  string tag = userName.toString() + "send-sync-interest";
+
   double interval = (m_syncInterestInterval > 0 && m_syncInterestInterval < 30.0) ? m_syncInterestInterval : 4.0;
-  m_sendSyncInterestTask = make_shared<PeriodicTask>(bind(&SyncCore::sendSyncInterest, this), tag, m_scheduler, make_shared<SimpleIntervalGenerator>(interval));
-  sendSyncInterest();
+  m_sendSyncInterestTask = make_shared<PeriodicTask>(bind(&SyncCore::sendSyncInterest, this), SYNC_INTEREST_TAG, m_scheduler, make_shared<SimpleIntervalGenerator>(interval));
+  // sendSyncInterest();
+  Scheduler::scheduleOneTimeTask (m_scheduler, 0.1, bind(&SyncCore::sendSyncInterest, this), SYNC_INTEREST_TAG2);
 }
 
 SyncCore::~SyncCore()
@@ -97,11 +101,12 @@
   _LOG_TRACE ("[" << m_log->GetLocalName () << "] publishes: " << oldHash->shortHash ());
   // _LOG_TRACE (msg);
 
+  m_scheduler->deleteTask (SYNC_INTEREST_TAG2);
   // no hurry in sending out new Sync Interest; if others send the new Sync Interest first, no problem, we know the new root hash already;
   // this is trying to avoid the situation that the order of SyncData and new Sync Interest gets reversed at receivers
   Scheduler::scheduleOneTimeTask (m_scheduler, 0.05,
                                   bind(&SyncCore::sendSyncInterest, this),
-                                  lexical_cast<string> (*m_rootHash));
+                                  SYNC_INTEREST_TAG2);
 
   //sendSyncInterest();
 }
@@ -214,7 +219,12 @@
     {
       _LOG_ERROR ("Got recovery DATA with empty content");
     }
-  sendSyncInterest();
+
+  // sendSyncInterest();
+  m_scheduler->deleteTask (SYNC_INTEREST_TAG2);
+  Scheduler::scheduleOneTimeTask (m_scheduler, 0,
+                                  bind(&SyncCore::sendSyncInterest, this),
+                                  SYNC_INTEREST_TAG2);
 }
 
 void
@@ -233,7 +243,12 @@
     }
 
   // resume outstanding sync interest
-  sendSyncInterest();
+  // sendSyncInterest();
+
+  m_scheduler->deleteTask (SYNC_INTEREST_TAG2);
+  Scheduler::scheduleOneTimeTask (m_scheduler, 0,
+                                  bind(&SyncCore::sendSyncInterest, this),
+                                  SYNC_INTEREST_TAG2);
 }
 
 void
@@ -316,7 +331,7 @@
 }
 
 void
-SyncCore::recover(const HashPtr &hash)
+SyncCore::recover(HashPtr hash)
 {
   if (!(*hash == *m_rootHash) && m_log->LookupSyncLog(*hash) <= 0)
   {

src/sync-core.h

diff --git a/src/sync-core.h b/src/sync-core.h
index a0eb547..423afcc 100644
--- a/src/sync-core.h
+++ b/src/sync-core.h
@@ -86,7 +86,7 @@
   deregister(const Ccnx::Name &name);
 
   void
-  recover(const HashPtr &hash);
+  recover(HashPtr hash);
 
 private:
   void