commit d010e2c59137e85fad51f35030d517102770bfcf
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Mar 12 21:55:04 2012 -0700
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Mar 12 21:55:04 2012 -0700
tree 66ac6e0acb24a09a63354370546544bfbcc63e3f
parent 0f334151c7da9ac3438df8eee7f482e39bbc8f0a

send out Sync Interest after SyncLogic object is created, or otherwise nothing
is going to happen

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 9491a5c..c46dbe8 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -48,6 +48,9 @@
 {
   m_ccnxHandle->setInterestFilter (syncPrefix,
                                    bind (&SyncLogic::respondSyncInterest, this, _1));
+
+	// We need to send out our Sync Interest when we're ready
+	sendSyncInterest();
 }
 
 SyncLogic::~SyncLogic ()
@@ -58,6 +61,7 @@
 void
 SyncLogic::respondSyncInterest (const string &interest)
 {
+	//cout << "Respond Sync Interest" << endl;
   string hash = interest.substr(interest.find_last_of("/") + 1);
   DigestPtr digest = make_shared<Digest> ();
   try
@@ -77,7 +81,7 @@
 void
 SyncLogic::processSyncInterest (DigestConstPtr digest, const std::string &interestName, bool timedProcessing/*=false*/)
 {
-  // cout << "SyncLogic::processSyncInterest " << timedProcessing << endl;
+  //cout << "SyncLogic::processSyncInterest " << timedProcessing << endl;
   recursive_mutex::scoped_lock lock (m_stateMutex);
     
   if (*m_state.getDigest() == *digest)
@@ -113,6 +117,7 @@
 void
 SyncLogic::processSyncData (const string &name, const string &dataBuffer)
 {
+	//cout << "Process Sync Data" <<endl;
   DiffStatePtr diffLog = make_shared<DiffState> ();
   
   try
@@ -196,7 +201,8 @@
       return;
     }
 
-  if (diffLog->getLeaves ().size () > 0)
+	// Zhenkai: shouldn't we all ways send a new Sync Interest?
+  //if (diffLog->getLeaves ().size () > 0)
     {
       sendSyncInterest();
     }
@@ -205,6 +211,7 @@
 void
 SyncLogic::processPendingSyncInterests(DiffStatePtr &diff) 
 {
+	//cout << "Process Pending Interests" <<endl;
   recursive_mutex::scoped_lock lock (m_stateMutex);
   diff->setDigest(m_state.getDigest());
   m_log.insert(diff);
@@ -221,6 +228,7 @@
 void
 SyncLogic::addLocalNames (const string &prefix, uint32_t session, uint32_t seq)
 {
+	//cout << "Add local names" <<endl;
   recursive_mutex::scoped_lock lock (m_stateMutex);
   NameInfoConstPtr info = StdNameInfo::FindOrCreate(prefix);
   SeqNo seqN(session, seq);
@@ -248,6 +256,7 @@
 void
 SyncLogic::sendSyncInterest ()
 {
+	//cout << "Sending Sync Interest" << endl;
   recursive_mutex::scoped_lock lock (m_stateMutex);
 
   ostringstream os;