HWMP-Statistics: added number of initiated PREQ, PREP, PERR
authorKirill Andreev <andreev@iitp.ru>
Wed, 08 Jul 2009 13:50:43 +0400
changeset 5108 c7e52ca238d3
parent 5107 ec4196c70800
child 5109 99c71ed33f5a
HWMP-Statistics: added number of initiated PREQ, PREP, PERR
src/devices/mesh/dot11s/hwmp-protocol.cc
src/devices/mesh/dot11s/hwmp-protocol.h
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc	Wed Jul 08 13:42:46 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc	Wed Jul 08 13:50:43 2009 +0400
@@ -317,6 +317,7 @@
     uint32_t dst_seqno = 0;
     if(result.retransmitter != Mac48Address::GetBroadcast ())
       dst_seqno = result.seqnum;
+    m_stats.initiatedPreq ++;
     for(HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)
       i->second->RequestDestination(destination, originator_seqno, dst_seqno);
   }
@@ -604,8 +605,7 @@
   HwmpProtocolMacMap::const_iterator prep_sender = m_interfaces.find (interface);
   NS_ASSERT(prep_sender != m_interfaces.end ());
   prep_sender->second->SendPrep (prep, retransmitter);
-  //m_prepCallback (prep, retransmitter);
-
+  m_stats.initiatedPrep ++;
 }
 bool
 HwmpProtocol::Install (Ptr<MeshPointDevice> mp)
@@ -672,6 +672,7 @@
   if(receivers.size () == 0)
     return;
   IePerr perr;
+  m_stats.initiatedPerr ++;
   for(unsigned int i = 0; i < destinations.size (); i ++)
   {
     perr.AddAddressUnit(destinations[i]);
@@ -964,7 +965,10 @@
     "txBytes=\"" << txBytes << "\" "
     "droppedTtl=\"" << droppedTtl << "\" "
     "totalQueued=\"" << totalQueued << "\" "
-    "totalDropped=\"" << totalDropped << "\"/>\n";
+    "totalDropped=\"" << totalDropped << "\" "
+    "initiatedPreq=\"" << initiatedPreq << "\" "
+    "initiatedPrep=\"" << initiatedPrep << "\" "
+    "initiatedPerr=\"" << initiatedPerr << "\"\n";
 }
 void
 HwmpProtocol::Report (std::ostream & os) const
--- a/src/devices/mesh/dot11s/hwmp-protocol.h	Wed Jul 08 13:42:46 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.h	Wed Jul 08 13:50:43 2009 +0400
@@ -151,9 +151,12 @@
     uint16_t droppedTtl;
     uint16_t totalQueued;
     uint16_t totalDropped;
+    uint16_t initiatedPreq;
+    uint16_t initiatedPrep;
+    uint16_t initiatedPerr;
 
     void Print (std::ostream & os) const;
-    Statistics () : txUnicast (0), txBroadcast (0), txBytes (0), droppedTtl (0), totalQueued (0), totalDropped (0) {}
+    Statistics () : txUnicast (0), txBroadcast (0), txBytes (0), droppedTtl (0), totalQueued (0), totalDropped (0), initiatedPreq (0), initiatedPrep (0), initiatedPerr (0) {}
   };
   Statistics m_stats;
   ///\}