Fix for CS tracers suggested by migrax (Connect forwarder cache hit and miss signals named-data-ndnSIM#111).

Author: carlosantoniobarrios

utils/tracers/ndn-cs-tracer.cpp

@@ -18,6 +18,8 @@
  **/
 
 #include "ndn-cs-tracer.hpp"
+#include "fw/forwarder.hpp"
+#include "model/ndn-l3-protocol.hpp"
 #include "ns3/node.h"
 #include "ns3/packet.h"
 #include "ns3/config.h"
@@ -199,10 +201,14 @@ CsTracer::~CsTracer(){};
 void
 CsTracer::Connect()
 {
-  // // @TODO Do the same with NFD content store...
-  // Ptr<ContentStore> cs = m_nodePtr->GetObject<ContentStore>();
-  // cs->TraceConnectWithoutContext("CacheHits", MakeCallback(&CsTracer::CacheHits, this));
-  // cs->TraceConnectWithoutContext("CacheMisses", MakeCallback(&CsTracer::CacheMisses, this));
+  auto l3proto = m_nodePtr->GetObject<ndn::L3Protocol>();
+  auto fwd = l3proto->getForwarder();
+
+  fwd->afterCsHit.connect(
+      [this](Interest interest, Data data) { CacheHits(interest, data); });
+
+  fwd->afterCsMiss.connect(
+      [this](Interest interest) { CacheMisses(interest); });
 
   Reset();
 }
@@ -233,7 +239,7 @@ CsTracer::PrintHeader(std::ostream& os) const
      << "Node"
      << "\t"
 
-     << "Type"
+     << "Type(cabeee)"
      << "\t"
      << "Packets"
      << "\t";
@@ -253,22 +259,27 @@ void
 CsTracer::Print(std::ostream& os) const
 {
   Time time = Simulator::Now();
-
-  PRINTER("CacheHits", m_cacheHits);
-  PRINTER("CacheMisses", m_cacheMisses);
+  if (m_stats.m_cacheHits > 0) // added by cabeee to avoid printing zeros (easier to look at logs)
+  {
+    PRINTER("CacheHits(cabeee)   ", m_cacheHits);
+  }
+  if (m_stats.m_cacheMisses > 0) // added by cabeee to avoid printing zeros (easier to look at logs)
+  {
+    PRINTER("CacheMisses(cabeee)  ", m_cacheMisses);
+  }
 }
 
 void
-CsTracer::CacheHits(shared_ptr<const Interest>, shared_ptr<const Data>)
+CsTracer::CacheHits(const Interest&, const Data&)
 {
   m_stats.m_cacheHits++;
 }
 
 void
-CsTracer::CacheMisses(shared_ptr<const Interest>)
+CsTracer::CacheMisses(const Interest&)
 {
   m_stats.m_cacheMisses++;
 }
 
 } // namespace ndn
-} // namespace ns3
+} // namespace ns3

utils/tracers/ndn-cs-tracer.hpp

@@ -173,10 +173,10 @@ class CsTracer : public SimpleRefCount<CsTracer> {
   Connect();
 
   void
-  CacheHits(shared_ptr<const Interest>, shared_ptr<const Data>);
+  CacheHits(const Interest&, const Data&);
 
   void
-  CacheMisses(shared_ptr<const Interest>);
+  CacheMisses(const Interest&);
 
 private:
   void
@@ -215,4 +215,4 @@ operator<<(std::ostream& os, const CsTracer& tracer)
 } // namespace ndn
 } // namespace ns3
 
-#endif // CCNX_CS_TRACER_H
+#endif // CCNX_CS_TRACER_H