model: Another set of refactoring/renaming to make code compile (not tested yet)
Refs #1005 (http://redmine.named-data.net/)
diff --git a/utils/tracers/ndn-l3-aggregate-tracer.cc b/utils/tracers/ndn-l3-aggregate-tracer.cc
index 5ece34c..d1150ae 100644
--- a/utils/tracers/ndn-l3-aggregate-tracer.cc
+++ b/utils/tracers/ndn-l3-aggregate-tracer.cc
@@ -61,7 +61,7 @@
os->open (file.c_str (), std::ios_base::out | std::ios_base::trunc);
if (!os->is_open ())
- return boost::make_tuple (outputStream, tracers);
+ return boost::make_tuple (outputStream, tracers);
outputStream = os;
}
@@ -102,7 +102,7 @@
os->open (file.c_str (), std::ios_base::out | std::ios_base::trunc);
if (!os->is_open ())
- return boost::make_tuple (outputStream, tracers);
+ return boost::make_tuple (outputStream, tracers);
outputStream = os;
}
@@ -143,7 +143,7 @@
os->open (file.c_str (), std::ios_base::out | std::ios_base::trunc);
if (!os->is_open ())
- return boost::make_tuple (outputStream, tracers);
+ return boost::make_tuple (outputStream, tracers);
outputStream = os;
}
@@ -298,69 +298,96 @@
}
void
-L3AggregateTracer::OutInterests (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::OutInterests (Ptr<const Interest> interest, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_outInterests ++;
- m_stats[face].get<1> ().m_outInterests += header->GetSerializedSize ();
+ if (interest->GetWire ())
+ {
+ m_stats[face].get<1> ().m_outInterests += interest->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::InInterests (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::InInterests (Ptr<const Interest> interest, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_inInterests ++;
- m_stats[face].get<1> ().m_inInterests += header->GetSerializedSize ();
+ if (interest->GetWire ())
+ {
+ m_stats[face].get<1> ().m_inInterests += interest->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::DropInterests (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::DropInterests (Ptr<const Interest> interest, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_dropInterests ++;
- m_stats[face].get<1> ().m_dropInterests += header->GetSerializedSize ();
+ if (interest->GetWire ())
+ {
+ m_stats[face].get<1> ().m_dropInterests += interest->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::OutNacks (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::OutNacks (Ptr<const Interest> nack, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_outNacks ++;
- m_stats[face].get<1> ().m_outNacks += header->GetSerializedSize ();
+ if (nack->GetWire ())
+ {
+ m_stats[face].get<1> ().m_outNacks += nack->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::InNacks (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::InNacks (Ptr<const Interest> nack, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_inNacks ++;
- m_stats[face].get<1> ().m_inNacks += header->GetSerializedSize ();
+ if (nack->GetWire ())
+ {
+ m_stats[face].get<1> ().m_inNacks += nack->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::DropNacks (Ptr<const Interest> header, Ptr<const Face> face)
+L3AggregateTracer::DropNacks (Ptr<const Interest> nack, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_dropNacks ++;
- m_stats[face].get<1> ().m_dropNacks += header->GetSerializedSize ();
+ if (nack->GetWire ())
+ {
+ m_stats[face].get<1> ().m_dropNacks += nack->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::OutData (Ptr<const ContentObject> header, Ptr<const Packet> payload,
+L3AggregateTracer::OutData (Ptr<const ContentObject> data,
bool fromCache, Ptr<const Face> face)
{
m_stats[face].get<0> ().m_outData ++;
- m_stats[face].get<1> ().m_outData += header->GetSerializedSize () + payload->GetSize ();
+ if (data->GetWire ())
+ {
+ m_stats[face].get<1> ().m_outData += data->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::InData (Ptr<const ContentObject> header, Ptr<const Packet> payload,
+L3AggregateTracer::InData (Ptr<const ContentObject> data,
Ptr<const Face> face)
{
m_stats[face].get<0> ().m_inData ++;
- m_stats[face].get<1> ().m_inData += header->GetSerializedSize () + payload->GetSize ();
+ if (data->GetWire ())
+ {
+ m_stats[face].get<1> ().m_inData += data->GetWire ()->GetSize ();
+ }
}
void
-L3AggregateTracer::DropData (Ptr<const ContentObject> header, Ptr<const Packet> payload,
+L3AggregateTracer::DropData (Ptr<const ContentObject> data,
Ptr<const Face> face)
{
m_stats[face].get<0> ().m_dropData ++;
- m_stats[face].get<1> ().m_dropData += header->GetSerializedSize () + payload->GetSize ();
+ if (data->GetWire ())
+ {
+ m_stats[face].get<1> ().m_dropData += data->GetWire ()->GetSize ();
+ }
}
void