Solving bug with interest-table
diff --git a/include/sync-app-socket.h b/include/sync-app-socket.h
index cf888d3..851a14c 100644
--- a/include/sync-app-socket.h
+++ b/include/sync-app-socket.h
@@ -87,6 +87,9 @@
uint32_t
getNextSeq (const std::string &prefix, uint32_t session);
+ SyncLogic &
+ getLogic () { return m_syncLogic; }
+
private:
void
passCallback(const std::vector<MissingDataInfo> &v) {m_newDataCallback(v, this);}
diff --git a/include/sync-leaf.h b/include/sync-leaf.h
index 95dff55..345be46 100644
--- a/include/sync-leaf.h
+++ b/include/sync-leaf.h
@@ -75,7 +75,7 @@
inline std::ostream &
operator << (std::ostream &os, const Leaf &leaf)
{
- os << leaf.getInfo () << "(" << leaf.getSeq () << ")";
+ os << *leaf.getInfo () << "(" << leaf.getSeq () << ")";
return os;
}
diff --git a/include/sync-logic.h b/include/sync-logic.h
index d0500c8..3626437 100644
--- a/include/sync-logic.h
+++ b/include/sync-logic.h
@@ -123,6 +123,9 @@
virtual void StopApplication ();
#endif
+ void
+ printState () const;
+
private:
void
delayedChecksLoop ();
diff --git a/model/sync-interest-table.cc b/model/sync-interest-table.cc
index a05dba3..b91dee3 100644
--- a/model/sync-interest-table.cc
+++ b/model/sync-interest-table.cc
@@ -45,7 +45,6 @@
Interest
SyncInterestTable::pop ()
{
- expireInterests ();
recursive_mutex::scoped_lock lock (m_mutex);
if (m_table.size () == 0)
diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index fe43abe..ed90655 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -586,5 +586,16 @@
return m_state->getLeaves ().size ();
}
+void
+SyncLogic::printState () const
+{
+ recursive_mutex::scoped_lock lock (m_stateMutex);
+
+ BOOST_FOREACH (const boost::shared_ptr<Sync::Leaf> leaf, m_state->getLeaves ())
+ {
+ std::cout << *leaf << std::endl;
+ }
+}
+
}