Rate recorder trace helper
Also a small change in CCNx trace API
diff --git a/model/ccnx-content-store.h b/model/ccnx-content-store.h
index dd0f884..9f07a47 100644
--- a/model/ccnx-content-store.h
+++ b/model/ccnx-content-store.h
@@ -174,7 +174,7 @@
* If an entry is found, it is promoted to the top of most recent
* used entries index, \see m_contentStore
*/
- boost::tuple<Ptr<Packet>, Ptr<const CcnxContentObjectHeader> >
+ boost::tuple<Ptr<Packet>, Ptr<const CcnxContentObjectHeader>, Ptr<const Packet> >
Lookup (Ptr<const CcnxInterestHeader> interest);
/**
@@ -215,22 +215,6 @@
* Release build dumps everything in MRU order
*/
void Print () const;
-
-protected:
- // /**
- // * \brief Move the given CS entry to the head of the list
- // *
- // * \param entry Content Store entry
- // */
- // void Promote( CsEntry &entry );
-
- /**
- * \todo Alex: DoDispose and NotifyNewAggregate are seem to be very
- * important, but I'm not yet sure what exactly they are supposed to
- * do
- */
- // virtual void DoDispose ();
- // virtual void NotifyNewAggregate ();
private:
CcnxContentStore (const CcnxContentStore &o); ///< Disabled copy constructor
@@ -244,7 +228,7 @@
* \brief Content store implemented as a Boost.MultiIndex container
* \internal
*/
- CcnxContentStoreContainer::type m_contentStore;
+ CcnxContentStoreContainer::type m_contentStore;
};
inline std::ostream&