F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XML reports simplified for better parsing

Browse Source
This commit is contained in:
Pavel Boyko
2009-06-30 18:13:44 +04:00
parent c7cbb7cf7c
commit 2cd65e7585
9 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/mesh/dot11s/hwmp-protocol-mac.cc
View File

@@ -334,13 +334,13 @@ HwmpProtocolMac::Statistics::Print (std::ostream & os) const
"rxPrep=\"" << rxPrep << "\"\n"
"rxPerr=\"" << rxPerr << "\"\n"
"txMgt=\"" << txMgt << "\"\n"
"txMgtBytes=\"" << (double)txMgtBytes / 1024.0 << "K\"\n"
"txMgtBytes=\"" << txMgtBytes << "\"\n"
"rxMgt=\"" << rxMgt << "\"\n"
"rxMgtBytes=\"" << (double)rxMgtBytes / 1204.0 << "K\"\n"
"rxMgtBytes=\"" << rxMgtBytes << "\"\n"
"txData=\"" << txData << "\"\n"
"txDataBytes=\"" << (double)txDataBytes / 1024.0 << "K\"\n"
"txDataBytes=\"" << txDataBytes << "\"\n"
"rxData=\"" << rxData << "\"\n"
"rxDataBytes=\"" << (double)rxDataBytes / 1024.0 << "K\"/>\n";
"rxDataBytes=\"" << rxDataBytes << "\"/>\n";
}
void
HwmpProtocolMac::Report (std::ostream & os) const

16
src/devices/mesh/dot11s/hwmp-protocol.cc
View File

@@ -961,7 +961,7 @@ void HwmpProtocol::Statistics::Print (std::ostream & os) const
os << "<Statistics "
"txUnicast=\"" << txUnicast << "\" "
"txBroadcast=\"" << txBroadcast << "\" "
"txBytes=\"" << txBytes / 1024 << "K\" "
"txBytes=\"" << txBytes << "\" "
"droppedTtl=\"" << droppedTtl << "\" "
"totalQueued=\"" << totalQueued << "\" "
"totalDropped=\"" << totalDropped << "\"/>\n";
@@ -973,13 +973,13 @@ HwmpProtocol::Report (std::ostream & os) const
"address=\"" << m_address << "\"\n"
"maxQueueSize=\"" << m_maxQueueSize << "\"\n"
"dot11MeshHWMPmaxPREQretries=\"" << (uint16_t)m_dot11MeshHWMPmaxPREQretries << "\"\n"
"dot11MeshHWMPnetDiameterTraversalTime=\"" << m_dot11MeshHWMPnetDiameterTraversalTime.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPpreqMinInterval=\"" << m_dot11MeshHWMPpreqMinInterval.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPperrMinInterval=\"" << m_dot11MeshHWMPperrMinInterval.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPactiveRootTimeout=\"" << m_dot11MeshHWMPactiveRootTimeout.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPactivePathTimeout=\"" << m_dot11MeshHWMPactivePathTimeout.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPpathToRootInterval=\"" << m_dot11MeshHWMPpathToRootInterval.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPrannInterval=\"" << m_dot11MeshHWMPrannInterval.GetMilliSeconds () << "ms\"\n"
"dot11MeshHWMPnetDiameterTraversalTime=\"" << m_dot11MeshHWMPnetDiameterTraversalTime.GetSeconds () << "\"\n"
"dot11MeshHWMPpreqMinInterval=\"" << m_dot11MeshHWMPpreqMinInterval.GetSeconds () << "\"\n"
"dot11MeshHWMPperrMinInterval=\"" << m_dot11MeshHWMPperrMinInterval.GetSeconds () << "\"\n"
"dot11MeshHWMPactiveRootTimeout=\"" << m_dot11MeshHWMPactiveRootTimeout.GetSeconds () << "\"\n"
"dot11MeshHWMPactivePathTimeout=\"" << m_dot11MeshHWMPactivePathTimeout.GetSeconds () << "\"\n"
"dot11MeshHWMPpathToRootInterval=\"" << m_dot11MeshHWMPpathToRootInterval.GetSeconds () << "\"\n"
"dot11MeshHWMPrannInterval=\"" << m_dot11MeshHWMPrannInterval.GetSeconds () << "\"\n"
"isRoot=\"" << m_isRoot << "\"\n"
"maxTtl=\"" << (uint16_t)m_maxTtl << "\"\n"
"unicastPerrThreshold=\"" << (uint16_t)m_unicastPerrThreshold << "\"\n"

8
src/devices/mesh/dot11s/peer-link.cc
View File

@@ -602,15 +602,11 @@ PeerLink::Report (std::ostream & os) const
"localAddress=\"" << m_macPlugin->GetAddress () << "\"\n"
"peerInterfaceAddress=\"" << m_peerAddress << "\"\n"
"peerMeshPointAddress=\"" << m_peerMeshPointAddress << "\"\n"
"metricOfTheLink=\"" << m_macPlugin->GetLinkMetric(m_peerAddress) << "\"\n"
"lastBeacon=\"" << m_lastBeacon.GetMilliSeconds () << "ms\"\n"
"metric=\"" << m_macPlugin->GetLinkMetric(m_peerAddress) << "\"\n"
"lastBeacon=\"" << m_lastBeacon.GetSeconds () << "\"\n"
"localLinkId=\"" << m_localLinkId << "\"\n"
"peerLinkId=\"" << m_peerLinkId << "\"\n"
"assocId=\"" << m_assocId << "\"\n"
"dot11MeshMaxRetries=\"" << m_dot11MeshMaxRetries << "\"\n"
"dot11MeshRetryTimeout=\"" << m_dot11MeshRetryTimeout.GetMilliSeconds () << "ms\"\n"
"dot11MeshHoldingTimeout=\"" << m_dot11MeshHoldingTimeout.GetMilliSeconds () << "ms\"\n"
"dot11MeshConfirmTimeout=\"" << m_dot11MeshConfirmTimeout.GetMilliSeconds () << "ms\"\n"
"/>\n";
}
} // namespace dot11s

4
src/devices/mesh/dot11s/peer-management-protocol-mac.cc
View File

@@ -289,9 +289,9 @@ PeerManagementProtocolMac::Statistics::Print (std::ostream & os) const
"dropped=\"" << dropped << "\"\n"
"brokenMgt=\"" << brokenMgt << "\"\n"
"txMgt=\"" << txMgt << "\"\n"
"txMgtBytes=\"" << (double)txMgtBytes /1024.0 << "\"\n"
"txMgtBytes=\"" << txMgtBytes << "\"\n"
"rxMgt=\"" << rxMgt << "\"\n"
"rxMgtBytes=\"" << (double)rxMgtBytes / 1024.0 << "K\"\n"
"rxMgtBytes=\"" << rxMgtBytes << "\"\n"
"beaconShift=\"" << beaconShift << "\"/>\n";
}
void

18
src/devices/mesh/dot11s/peer-management-protocol.cc
View File

@@ -61,8 +61,7 @@ PeerManagementProtocol::GetTypeId (void)
}
PeerManagementProtocol::PeerManagementProtocol ():
m_lastAssocId (0),
m_lastLocalLinkId (1),
m_numberOfActivePeers (0)
m_lastLocalLinkId (1)
{
}
PeerManagementProtocol::~PeerManagementProtocol ()
@@ -345,9 +344,7 @@ PeerManagementProtocol::IsActiveLink (uint32_t interface, Mac48Address peerAddre
bool
PeerManagementProtocol::ShouldSendOpen (uint32_t interface, Mac48Address peerAddress)
{
if (m_numberOfActivePeers > m_maxNumberOfPeerLinks)
return false;
return true;
return (m_stats.linksTotal <= m_maxNumberOfPeerLinks);
}
bool
PeerManagementProtocol::ShouldAcceptOpen (
@@ -355,7 +352,7 @@ PeerManagementProtocol::ShouldAcceptOpen (
Mac48Address peerAddress,
PmpReasonCode & reasonCode)
{
if (m_numberOfActivePeers > m_maxNumberOfPeerLinks)
if (m_stats.linksTotal > m_maxNumberOfPeerLinks)
{
reasonCode = REASON11S_MESH_MAX_PEERS;
return false;
@@ -428,14 +425,14 @@ PeerManagementProtocol::PeerLinkStatus (uint32_t interface, Mac48Address peerAdd
if((nstate == PeerLink::ESTAB) && (ostate != PeerLink::ESTAB))
{
m_stats.linksOpened ++;
m_numberOfActivePeers ++;
m_stats.linksTotal++;
if(!m_peerStatusCallback.IsNull ())
m_peerStatusCallback (peerMeshPointAddress, peerAddress, interface, true);
}
if((ostate == PeerLink::ESTAB) && (nstate != PeerLink::ESTAB))
{
m_stats.linksClosed ++;
m_numberOfActivePeers --;
m_stats.linksTotal--;
if(!m_peerStatusCallback.IsNull ())
m_peerStatusCallback (peerMeshPointAddress, peerAddress, interface, false);
}
@@ -448,7 +445,7 @@ PeerManagementProtocol::PeerLinkStatus (uint32_t interface, Mac48Address peerAdd
uint8_t
PeerManagementProtocol::GetNumberOfLinks ()
{
return m_numberOfActivePeers;
return m_stats.linksTotal;
}
Ptr<IeMeshId>
PeerManagementProtocol::GetMeshId () const
@@ -470,6 +467,7 @@ void
PeerManagementProtocol::Statistics::Print (std::ostream & os) const
{
os << "<Statistics "
"linksTotal=\"" << linksTotal << "\" "
"linksOpened=\"" << linksOpened << "\" "
"linksClosed=\"" << linksClosed << "\"/>\n";
}
@@ -493,7 +491,7 @@ PeerManagementProtocol::Report (std::ostream & os) const
void
PeerManagementProtocol::ResetStats ()
{
m_stats = Statistics::Statistics ();
m_stats = Statistics::Statistics (m_stats.linksTotal); // don't reset number of links
for(PeerManagementProtocolMacMap::const_iterator plugins = m_plugins.begin (); plugins != m_plugins.end (); plugins ++)
plugins->second->ResetStats ();
}

4
src/devices/mesh/dot11s/peer-management-protocol.h
View File

@@ -212,7 +212,6 @@ private:
///\}
uint16_t m_lastAssocId;
uint16_t m_lastLocalLinkId;
uint8_t m_numberOfActivePeers; //number of established peer links
uint8_t m_maxNumberOfPeerLinks;
/**
* Peer Links
@@ -232,10 +231,11 @@ private:
///\}
//Keeps statistics
struct Statistics {
uint16_t linksTotal;
uint16_t linksOpened;
uint16_t linksClosed;
Statistics () : linksOpened (0), linksClosed (0) {};
Statistics (uint16_t t = 0) : linksTotal(t), linksOpened (0), linksClosed (0) {};
void Print (std::ostream & os) const;
};
struct Statistics m_stats;

12
src/devices/mesh/mesh-point-device.cc
View File

@@ -424,17 +424,17 @@ MeshPointDevice::Report (std::ostream & os) const
{
os << "<Statistics \n"
"txUnicastData=\"" << m_txStats.unicastData << "\"\n"
"txUnicastDataBytes=\"" << (double)m_txStats.unicastDataBytes / 1024 << "K\"\n"
"txUnicastDataBytes=\"" << m_txStats.unicastDataBytes << "\"\n"
"txBroadcastData=\"" << m_txStats.broadcastData << "\"\n"
"txBroadcastDataBytes=\"" << (double)m_txStats.broadcastDataBytes / 1024 << "K\"\n"
"txBroadcastDataBytes=\"" << m_txStats.broadcastDataBytes << "\"\n"
"rxUnicastData=\"" << m_rxStats.unicastData << "\"\n"
"rxUnicastDataBytes=\"" << (double)m_rxStats.unicastDataBytes / 1024 << "K\"\n"
"rxUnicastDataBytes=\"" << m_rxStats.unicastDataBytes << "\"\n"
"rxBroadcastData=\"" << m_rxStats.broadcastData << "\"\n"
"rxBroadcastDataBytes=\"" << (double)m_rxStats.broadcastDataBytes / 1024 << "K\"\n"
"rxBroadcastDataBytes=\"" << m_rxStats.broadcastDataBytes << "\"\n"
"fwdUnicastData=\"" << m_fwdStats.unicastData << "\"\n"
"fwdUnicastDataBytes=\"" << (double)m_fwdStats.unicastDataBytes / 1024 << "K\"\n"
"fwdUnicastDataBytes=\"" << m_fwdStats.unicastDataBytes << "\"\n"
"fwdBroadcastData=\"" << m_fwdStats.broadcastData << "\"\n"
"fwdBroadcastDataBytes=\"" << (double)m_fwdStats.broadcastDataBytes / 1024 << "K\"\n"
"fwdBroadcastDataBytes=\"" << m_fwdStats.broadcastDataBytes << "\"\n"
"/>\n";
}

7
src/devices/mesh/mesh-wifi-interface-mac.cc
View File

@@ -648,17 +648,18 @@ void
MeshWifiInterfaceMac::Statistics::Print (std::ostream & os) const
{
os << "<Statistics "
// TODO txBeacons
"rxBeacons=\"" << recvBeacons << "\" "
"txFrames=\"" << sentFrames << "\" "
"txBytes=\"" << (double)sentBytes / 1024.0 << "K\" "
"txBytes=\"" << sentBytes << "\" "
"rxFrames=\"" << recvFrames << "\" "
"rxBytes=\"" << (double)recvBytes / 1024.0 << "K\"/>\n";
"rxBytes=\"" << recvBytes << "\"/>\n";
}
void
MeshWifiInterfaceMac::Report (std::ostream & os) const
{
os << "<Interface "
"BeaconInterval=\"" << GetBeaconInterval ().GetSeconds() << "s\" "
"BeaconInterval=\"" << GetBeaconInterval ().GetSeconds() << "\" "
"Channel=\"" << GetFrequencyChannel () << "\" "
"Address = \"" << GetAddress () << "\">\n";
m_stats.Print (os);

2
src/helper/mesh-helper.cc
View File

@@ -89,7 +89,7 @@ MeshHelper::Report (const ns3::Ptr<ns3::NetDevice>& device, std::ostream& os)
Ptr <MeshPointDevice> mp = device->GetObject<MeshPointDevice> ();
NS_ASSERT (mp != 0);
std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
os << "<MeshPointDevice ReportTime=\"" << Simulator::Now().GetSeconds() << "s\" MpAddress=\"" << mp->GetAddress () << "\">\n";
os << "<MeshPointDevice time=\"" << Simulator::Now().GetSeconds() << "\" address=\"" << Mac48Address::ConvertFrom(mp->GetAddress ()) << "\">\n";
m_stack->Report (mp, os);
os << "</MeshPointDevice>\n";
}