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

Mesh: PeerManagementProtocol: added trace sources for peer link change

Browse Source
This commit is contained in:
Kirill Andreev
2009-12-01 17:09:50 +03:00
parent 69d331b5dc
commit 4e1f979f9e
2 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@
#include "ns3/mesh-wifi-interface-mac.h"
#include "ns3/mesh-wifi-interface-mac-plugin.h"
#include "ns3/wifi-net-device.h"
#include "ns3/trace-source-accessor.h"
NS_LOG_COMPONENT_DEFINE ("PeerManagementProtocol");
namespace ns3 {
@@ -69,6 +70,15 @@ PeerManagementProtocol::GetTypeId (void)
&PeerManagementProtocol::SetBeaconCollisionAvoidance, &PeerManagementProtocol::GetBeaconCollisionAvoidance),
MakeBooleanChecker ()
)
.AddTraceSource ("LinkOpen",
"New peer link opened",
MakeTraceSourceAccessor (&PeerManagementProtocol::m_linkOpenTraceSrc)
)
.AddTraceSource ("LinkClose",
"New peer link closed",
MakeTraceSourceAccessor (&PeerManagementProtocol::m_linkCloseTraceSrc)
)
;
return tid;
}
@@ -434,6 +444,33 @@ PeerManagementProtocol::TimeToTu (Time x)
{
return (uint32_t) (x.GetMicroSeconds () / 1024);
}
void
PeerManagementProtocol::NotifyLinkOpen (Mac48Address peerMp, Mac48Address peerIface, Mac48Address myIface, uint32_t interface)
{
NS_LOG_LOGIC ("link_open " << myIface << " " << peerIface);
m_stats.linksOpened++;
m_stats.linksTotal++;
if (!m_peerStatusCallback.IsNull ())
{
m_peerStatusCallback (peerMp, peerIface, interface, true);
}
m_linkOpenTraceSrc (myIface, peerIface);
}
void
PeerManagementProtocol::NotifyLinkClose (Mac48Address peerMp, Mac48Address peerIface, Mac48Address myIface, uint32_t interface)
{
NS_LOG_LOGIC ("link_close " << myIface << " " << peerIface);
m_stats.linksClosed++;
m_stats.linksTotal--;
if (!m_peerStatusCallback.IsNull ())
{
m_peerStatusCallback (peerMp, peerIface, interface, false);
}
m_linkCloseTraceSrc (myIface, peerIface);
}
void
PeerManagementProtocol::PeerLinkStatus (uint32_t interface, Mac48Address peerAddress,
Mac48Address peerMeshPointAddress, PeerLink::PeerState ostate, PeerLink::PeerState nstate)
@@ -445,21 +482,11 @@ PeerManagementProtocol::PeerLinkStatus (uint32_t interface, Mac48Address peerAdd
<< ", at my interface ID:" << interface << ". State movement:" << ostate << " -> " << nstate);
if ((nstate == PeerLink::ESTAB) && (ostate != PeerLink::ESTAB))
{
m_stats.linksOpened++;
m_stats.linksTotal++;
if (!m_peerStatusCallback.IsNull ())
{
m_peerStatusCallback (peerMeshPointAddress, peerAddress, interface, true);
}
NotifyLinkOpen (peerMeshPointAddress, peerAddress, plugin->second->GetAddress (), interface);
}
if ((ostate == PeerLink::ESTAB) && (nstate != PeerLink::ESTAB))
{
m_stats.linksClosed++;
m_stats.linksTotal--;
if (!m_peerStatusCallback.IsNull ())
{
m_peerStatusCallback (peerMeshPointAddress, peerAddress, interface, false);
}
NotifyLinkClose (peerMeshPointAddress, peerAddress, plugin->second->GetAddress (), interface);
}
if (nstate == PeerLink::IDLE)
{

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

@@ -26,6 +26,7 @@
#include "ns3/net-device.h"
#include "ns3/event-id.h"
#include "ns3/nstime.h"
#include "ns3/traced-value.h"
#include "ie-dot11s-beacon-timing.h"
#include "ie-dot11s-peer-management.h"
#include "peer-link.h"
@@ -200,6 +201,11 @@ private:
Time TuToTime (uint32_t x);
uint32_t TimeToTu (Time x);
///\}
/// Aux. method to register open links
void NotifyLinkOpen (Mac48Address peerMp, Mac48Address peerIface, Mac48Address myIface, uint32_t interface);
/// Aux. method to register closed links
void NotifyLinkClose (Mac48Address peerMp, Mac48Address peerIface, Mac48Address myIface, uint32_t interface);
private:
PeerManagementProtocolMacMap m_plugins;
Mac48Address m_address;
@@ -233,7 +239,14 @@ private:
* bool is status - true when new link has appeared, false - when link was closed,
*/
Callback <void, Mac48Address, Mac48Address, uint32_t, bool> m_peerStatusCallback;
///\}
/// Simple link open/close trace source type. Addresses are: src interface, dst interface
typedef TracedCallback <Mac48Address, Mac48Address> LinkEventCallback;
/// LinkOpen trace source
LinkEventCallback m_linkOpenTraceSrc;
/// LinkClose trace source
LinkEventCallback m_linkCloseTraceSrc;
///\name Statistics:
///\{
struct Statistics {