--- a/src/devices/mesh/dot11s/hwmp-protocol-mac.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol-mac.cc Tue Jul 21 13:14:52 2009 +0400
@@ -408,6 +408,22 @@
{
return m_parent->GetFrequencyChannel ();
}
+HwmpProtocolMac::Statistics::Statistics () :
+ txPreq (0),
+ rxPreq (0),
+ txPrep (0),
+ rxPrep (0),
+ txPerr (0),
+ rxPerr (0),
+ txMgt (0),
+ txMgtBytes (0),
+ rxMgt (0),
+ rxMgtBytes (0),
+ txData (0),
+ txDataBytes (0),
+ rxData (0),
+ rxDataBytes (0)
+{}
void
HwmpProtocolMac::Statistics::Print (std::ostream & os) const
{
--- a/src/devices/mesh/dot11s/hwmp-protocol-mac.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol-mac.h Tue Jul 21 13:14:52 2009 +0400
@@ -126,22 +126,7 @@
uint16_t rxData;
uint32_t rxDataBytes;
void Print (std::ostream & os) const;
- Statistics () :
- txPreq (0),
- rxPreq (0),
- txPrep (0),
- rxPrep (0),
- txPerr (0),
- rxPerr (0),
- txMgt (0),
- txMgtBytes (0),
- rxMgt (0),
- rxMgtBytes (0),
- txData (0),
- txDataBytes (0),
- rxData (0),
- rxDataBytes (0)
- {}
+ Statistics ();
};
Statistics m_stats;
//\}
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc Tue Jul 21 13:14:52 2009 +0400
@@ -1063,6 +1063,17 @@
return m_address;
}
//Statistics:
+HwmpProtocol::Statistics::Statistics () :
+ txUnicast (0),
+ txBroadcast (0),
+ txBytes (0),
+ droppedTtl (0),
+ totalQueued (0),
+ totalDropped (0),
+ initiatedPreq (0),
+ initiatedPrep (0),
+ initiatedPerr (0)
+{}
void HwmpProtocol::Statistics::Print (std::ostream & os) const
{
os << "<Statistics "
--- a/src/devices/mesh/dot11s/hwmp-protocol.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.h Tue Jul 21 13:14:52 2009 +0400
@@ -172,7 +172,7 @@
uint16_t initiatedPerr;
void Print (std::ostream & os) const;
- Statistics () : txUnicast (0), txBroadcast (0), txBytes (0), droppedTtl (0), totalQueued (0), totalDropped (0), initiatedPreq (0), initiatedPrep (0), initiatedPerr (0) {}
+ Statistics ();
};
Statistics m_stats;
///\}
--- a/src/devices/mesh/dot11s/peer-management-protocol.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol.cc Tue Jul 21 13:14:52 2009 +0400
@@ -522,6 +522,11 @@
{
return m_address;
}
+PeerManagementProtocol::Statistics::Statistics (uint16_t t) :
+ linksTotal(t),
+ linksOpened (0),
+ linksClosed (0)
+{}
void
PeerManagementProtocol::Statistics::Print (std::ostream & os) const
{
--- a/src/devices/mesh/dot11s/peer-management-protocol.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol.h Tue Jul 21 13:14:52 2009 +0400
@@ -236,7 +236,7 @@
uint16_t linksOpened;
uint16_t linksClosed;
- Statistics (uint16_t t = 0) : linksTotal(t), linksOpened (0), linksClosed (0) {};
+ Statistics (uint16_t t = 0);
void Print (std::ostream & os) const;
};
struct Statistics m_stats;
--- a/src/devices/mesh/flame/flame-protocol-mac.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol-mac.cc Tue Jul 21 13:14:52 2009 +0400
@@ -82,6 +82,14 @@
{
return m_parent->GetFrequencyChannel ();
}
+FlameProtocolMac::Statistics::Statistics () :
+ txUnicast (0),
+ txBroadcast (0),
+ txBytes (0),
+ rxUnicast (0),
+ rxBroadcast (0),
+ rxBytes (0)
+{}
void
FlameProtocolMac::Statistics::Print (std::ostream &os) const
{
--- a/src/devices/mesh/flame/flame-protocol-mac.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol-mac.h Tue Jul 21 13:14:52 2009 +0400
@@ -69,7 +69,7 @@
uint32_t rxBytes;
void Print (std::ostream & os) const;
- Statistics () : txUnicast (0), txBroadcast (0), txBytes (0), rxUnicast (0), rxBroadcast (0), rxBytes (0) {}
+ Statistics ();
};
Statistics m_stats;
///\}
--- a/src/devices/mesh/flame/flame-protocol.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol.cc Tue Jul 21 13:14:52 2009 +0400
@@ -307,6 +307,13 @@
return false;
}
//Statistics:
+FlameProtocol::Statistics::Statistics () :
+ txUnicast (0),
+ txBroadcast (0),
+ txBytes (0),
+ droppedTtl (0),
+ totalDropped (0)
+{}
void FlameProtocol::Statistics::Print (std::ostream & os) const
{
os << "<Statistics "
--- a/src/devices/mesh/flame/flame-protocol.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol.h Tue Jul 21 13:14:52 2009 +0400
@@ -143,7 +143,7 @@
uint16_t droppedTtl;
uint16_t totalDropped;
void Print (std::ostream & os) const;
- Statistics () : txUnicast (0), txBroadcast (0), txBytes (0), droppedTtl (0), totalDropped (0) {}
+ Statistics ();
};
Statistics m_stats;
///\}
--- a/src/devices/mesh/mesh-point-device.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/mesh-point-device.cc Tue Jul 21 13:14:52 2009 +0400
@@ -441,6 +441,12 @@
}
}
}
+MeshPointDevice::Statistics::Statistics () :
+ unicastData (0),
+ unicastDataBytes (0),
+ broadcastData (0),
+ broadcastDataBytes (0)
+{}
void
MeshPointDevice::Report (std::ostream & os) const
--- a/src/devices/mesh/mesh-point-device.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/mesh-point-device.h Tue Jul 21 13:14:52 2009 +0400
@@ -188,12 +188,7 @@
uint32_t broadcastData;
uint32_t broadcastDataBytes;
- Statistics () : unicastData (0),
- unicastDataBytes (0),
- broadcastData (0),
- broadcastDataBytes (0)
- {
- }
+ Statistics ();
};
/// Counters
Statistics m_rxStats, m_txStats, m_fwdStats;
--- a/src/devices/mesh/mesh-wifi-interface-mac.cc Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-interface-mac.cc Tue Jul 21 13:14:52 2009 +0400
@@ -667,6 +667,13 @@
return m_mpAddress;
}
//Statistics:
+MeshWifiInterfaceMac::Statistics::Statistics () :
+ recvBeacons (0),
+ sentFrames (0),
+ sentBytes (0),
+ recvFrames (0),
+ recvBytes (0)
+{}
void
MeshWifiInterfaceMac::Statistics::Print (std::ostream & os) const
{
--- a/src/devices/mesh/mesh-wifi-interface-mac.h Tue Jul 21 12:51:09 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-interface-mac.h Tue Jul 21 13:14:52 2009 +0400
@@ -237,13 +237,7 @@
uint32_t recvFrames;
uint32_t recvBytes;
void Print (std::ostream & os) const;
- Statistics () :
- recvBeacons (0),
- sentFrames (0),
- sentBytes (0),
- recvFrames (0),
- recvBytes (0)
- {}
+ Statistics ();
};
Statistics m_stats;
///\}