wifi: Cleanup debugging logs
This commit is contained in:
@@ -577,6 +577,8 @@ WifiPhyHelper::GetPcapDataLinkType (void) const
|
||||
void
|
||||
WifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << prefix << nd << promiscuous << explicitFilename);
|
||||
|
||||
//All of the Pcap enable functions vector through here including the ones
|
||||
//that are wandering through all of devices on perhaps all of the nodes in
|
||||
//the system. We can only deal with devices of type WifiNetDevice.
|
||||
|
||||
@@ -283,7 +283,6 @@ AarfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
AarfWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -118,7 +118,6 @@ AarfcdWifiManager::GetTypeId (void)
|
||||
AarfcdWifiManager::AarfcdWifiManager ()
|
||||
: WifiRemoteStationManager (),
|
||||
m_currentRate (0)
|
||||
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
@@ -363,7 +362,6 @@ AarfcdWifiManager::DoNeedRts (WifiRemoteStation *st,
|
||||
bool
|
||||
AarfcdWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -390,7 +390,6 @@ AmrrWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
AmrrWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1185,13 +1185,10 @@ ApWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
|
||||
}
|
||||
|
||||
void
|
||||
ApWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
|
||||
const WifiMacHeader *hdr)
|
||||
ApWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << aggregatedPacket << hdr);
|
||||
MsduAggregator::DeaggregatedMsdus packets =
|
||||
MsduAggregator::Deaggregate (aggregatedPacket);
|
||||
|
||||
MsduAggregator::DeaggregatedMsdus packets = MsduAggregator::Deaggregate (aggregatedPacket);
|
||||
for (MsduAggregator::DeaggregatedMsdusCI i = packets.begin ();
|
||||
i != packets.end (); ++i)
|
||||
{
|
||||
|
||||
@@ -127,6 +127,7 @@ AparfWifiManager::~AparfWifiManager ()
|
||||
void
|
||||
AparfWifiManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
m_minPower = phy->GetTxPowerStart ();
|
||||
m_maxPower = phy->GetTxPowerEnd ();
|
||||
WifiRemoteStationManager::SetupPhy (phy);
|
||||
@@ -232,7 +233,6 @@ AparfWifiManager::DoReportRtsOk (WifiRemoteStation *station, double ctsSnr,
|
||||
WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station << ctsSnr << ctsMode << rtsSnr);
|
||||
NS_LOG_DEBUG ("station=" << station << " rts ok");
|
||||
}
|
||||
|
||||
void
|
||||
@@ -376,7 +376,6 @@ AparfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
AparfWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -107,6 +107,7 @@ ArfWifiManager::DoReportRtsFailed (WifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
}
|
||||
|
||||
/**
|
||||
* It is important to realize that "recovery" mode starts after failure of
|
||||
* the first transmission after a rate increase and ends at the first successful
|
||||
@@ -258,7 +259,6 @@ ArfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
ArfWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -141,7 +141,6 @@ CaraWifiManager::DoReportRtsOk (WifiRemoteStation *st,
|
||||
double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st << ctsSnr << ctsMode << rtsSnr);
|
||||
NS_LOG_DEBUG ("self=" << st << " rts ok");
|
||||
}
|
||||
|
||||
void
|
||||
@@ -238,7 +237,6 @@ CaraWifiManager::DoNeedRts (WifiRemoteStation *st,
|
||||
bool
|
||||
CaraWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -130,7 +130,6 @@ ConstantRateWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
ConstantRateWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -117,6 +117,7 @@ DcfManager::DcfManager ()
|
||||
|
||||
DcfManager::~DcfManager ()
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
delete m_phyListener;
|
||||
m_phyListener = 0;
|
||||
}
|
||||
|
||||
@@ -68,10 +68,12 @@ IdealWifiManager::GetTypeId (void)
|
||||
IdealWifiManager::IdealWifiManager ()
|
||||
: m_currentRate (0)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
IdealWifiManager::~IdealWifiManager ()
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -215,19 +217,21 @@ IdealWifiManager::DoCreateStation (void) const
|
||||
|
||||
|
||||
void
|
||||
IdealWifiManager::DoReportRxOk (WifiRemoteStation *station,
|
||||
double rxSnr, WifiMode txMode)
|
||||
IdealWifiManager::DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station << rxSnr << txMode);
|
||||
}
|
||||
|
||||
void
|
||||
IdealWifiManager::DoReportRtsFailed (WifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
}
|
||||
|
||||
void
|
||||
IdealWifiManager::DoReportDataFailed (WifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -270,11 +274,13 @@ IdealWifiManager::DoReportAmpduTxStatus (WifiRemoteStation *st, uint8_t nSuccess
|
||||
void
|
||||
IdealWifiManager::DoReportFinalRtsFailed (WifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
}
|
||||
|
||||
void
|
||||
IdealWifiManager::DoReportFinalDataFailed (WifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
}
|
||||
|
||||
WifiTxVector
|
||||
|
||||
@@ -519,7 +519,6 @@ void
|
||||
MinstrelHtWifiManager::DoReportRtsOk (WifiRemoteStation *st, double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
NS_LOG_DEBUG ("self=" << st << " rts ok");
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1058,7 +1057,6 @@ MinstrelHtWifiManager::CountRetries (MinstrelHtWifiRemoteStation *station)
|
||||
bool
|
||||
MinstrelHtWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1117,7 +1115,7 @@ uint32_t
|
||||
MinstrelHtWifiManager::FindRate (MinstrelHtWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
NS_LOG_DEBUG ("FindRate " << "packet=" << station->m_totalPacketsCount );
|
||||
NS_LOG_DEBUG ("FindRate packet=" << station->m_totalPacketsCount );
|
||||
|
||||
if ((station->m_samplePacketsCount + station->m_totalPacketsCount) == 0)
|
||||
{
|
||||
@@ -1223,8 +1221,6 @@ MinstrelHtWifiManager::UpdateStats (MinstrelHtWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
|
||||
NS_LOG_DEBUG ("Updating stats=" << this);
|
||||
|
||||
station->m_nextStatsUpdate = Simulator::Now () + m_updateStats;
|
||||
|
||||
station->m_numSamplesSlow = 0;
|
||||
@@ -1490,7 +1486,6 @@ void
|
||||
MinstrelHtWifiManager::RateInit (MinstrelHtWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
NS_LOG_DEBUG ("RateInit=" << station);
|
||||
|
||||
station->m_groupsTable = McsGroupData (m_numGroups);
|
||||
|
||||
|
||||
@@ -694,8 +694,7 @@ MinstrelWifiManager::UpdateStats (MinstrelWifiRemoteStation *station)
|
||||
}
|
||||
|
||||
void
|
||||
MinstrelWifiManager::DoReportRxOk (WifiRemoteStation *st,
|
||||
double rxSnr, WifiMode txMode)
|
||||
MinstrelWifiManager::DoReportRxOk (WifiRemoteStation *st, double rxSnr, WifiMode txMode)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st << rxSnr << txMode);
|
||||
NS_LOG_DEBUG ("DoReportRxOk m_txrate=" << ((MinstrelWifiRemoteStation *)st)->m_txrate);
|
||||
@@ -707,15 +706,13 @@ MinstrelWifiManager::DoReportRtsFailed (WifiRemoteStation *st)
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *)st;
|
||||
NS_LOG_DEBUG ("DoReportRtsFailed m_txrate=" << station->m_txrate);
|
||||
|
||||
station->m_shortRetry++;
|
||||
}
|
||||
|
||||
void
|
||||
MinstrelWifiManager::DoReportRtsOk (WifiRemoteStation *st, double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
NS_LOG_DEBUG ("self=" << st << " rts ok");
|
||||
NS_LOG_FUNCTION (this << st << ctsSnr << ctsMode << rtsSnr);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -723,7 +720,6 @@ MinstrelWifiManager::DoReportFinalRtsFailed (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *)st;
|
||||
NS_LOG_DEBUG ("Final RTS failed");
|
||||
UpdateRetry (station);
|
||||
}
|
||||
|
||||
@@ -746,7 +742,7 @@ void
|
||||
MinstrelWifiManager::DoReportDataOk (WifiRemoteStation *st,
|
||||
double ackSnr, WifiMode ackMode, double dataSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (st << ackSnr << ackMode << dataSnr);
|
||||
NS_LOG_FUNCTION (this << st << ackSnr << ackMode << dataSnr);
|
||||
MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *) st;
|
||||
|
||||
CheckInit (station);
|
||||
@@ -880,7 +876,6 @@ MinstrelWifiManager::DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const
|
||||
bool
|
||||
MinstrelWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -909,8 +904,7 @@ MinstrelWifiManager::GetNextSample (MinstrelWifiRemoteStation *station)
|
||||
void
|
||||
MinstrelWifiManager::RateInit (MinstrelWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (station);
|
||||
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
for (uint8_t i = 0; i < station->m_nModes; i++)
|
||||
{
|
||||
NS_LOG_DEBUG ("Initializing rate index " << static_cast<uint16_t>(i) << " " << GetSupported (station, i));
|
||||
@@ -979,8 +973,7 @@ MinstrelWifiManager::CalculateTimeUnicastPacket (Time dataTransmissionTime, uint
|
||||
void
|
||||
MinstrelWifiManager::InitSampleTable (MinstrelWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_DEBUG ("InitSampleTable=" << this);
|
||||
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
station->m_col = station->m_index = 0;
|
||||
|
||||
//for off-setting to make rates fall between 0 and nModes
|
||||
@@ -1012,8 +1005,7 @@ MinstrelWifiManager::InitSampleTable (MinstrelWifiRemoteStation *station)
|
||||
void
|
||||
MinstrelWifiManager::PrintSampleTable (MinstrelWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_DEBUG ("PrintSampleTable=" << station);
|
||||
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
uint8_t numSampleRates = station->m_nModes;
|
||||
std::stringstream table;
|
||||
for (uint8_t i = 0; i < numSampleRates; i++)
|
||||
|
||||
@@ -81,15 +81,18 @@ OnoeWifiManager::OnoeWifiManager ()
|
||||
: WifiRemoteStationManager (),
|
||||
m_currentRate (0)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
OnoeWifiManager::~OnoeWifiManager ()
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
WifiRemoteStation *
|
||||
OnoeWifiManager::DoCreateStation (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
OnoeWifiRemoteStation *station = new OnoeWifiRemoteStation ();
|
||||
station->m_nextModeUpdate = Simulator::Now () + m_updatePeriod;
|
||||
station->m_shortRetry = 0;
|
||||
@@ -103,14 +106,15 @@ OnoeWifiManager::DoCreateStation (void) const
|
||||
}
|
||||
|
||||
void
|
||||
OnoeWifiManager::DoReportRxOk (WifiRemoteStation *station,
|
||||
double rxSnr, WifiMode txMode)
|
||||
OnoeWifiManager::DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station << rxSnr << txMode);
|
||||
}
|
||||
|
||||
void
|
||||
OnoeWifiManager::DoReportRtsFailed (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
station->m_shortRetry++;
|
||||
}
|
||||
@@ -118,20 +122,21 @@ OnoeWifiManager::DoReportRtsFailed (WifiRemoteStation *st)
|
||||
void
|
||||
OnoeWifiManager::DoReportDataFailed (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
station->m_longRetry++;
|
||||
}
|
||||
|
||||
void
|
||||
OnoeWifiManager::DoReportRtsOk (WifiRemoteStation *station,
|
||||
double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
OnoeWifiManager::DoReportRtsOk (WifiRemoteStation *station, double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station<< ctsSnr << ctsMode << rtsSnr);
|
||||
}
|
||||
|
||||
void
|
||||
OnoeWifiManager::DoReportDataOk (WifiRemoteStation *st,
|
||||
double ackSnr, WifiMode ackMode, double dataSnr)
|
||||
OnoeWifiManager::DoReportDataOk (WifiRemoteStation *st, double ackSnr, WifiMode ackMode, double dataSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st << ackSnr << ackMode << dataSnr);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
UpdateRetry (station);
|
||||
station->m_tx_ok++;
|
||||
@@ -140,6 +145,7 @@ OnoeWifiManager::DoReportDataOk (WifiRemoteStation *st,
|
||||
void
|
||||
OnoeWifiManager::DoReportFinalRtsFailed (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
UpdateRetry (station);
|
||||
station->m_tx_err++;
|
||||
@@ -148,6 +154,7 @@ OnoeWifiManager::DoReportFinalRtsFailed (WifiRemoteStation *st)
|
||||
void
|
||||
OnoeWifiManager::DoReportFinalDataFailed (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
UpdateRetry (station);
|
||||
station->m_tx_err++;
|
||||
@@ -156,6 +163,7 @@ OnoeWifiManager::DoReportFinalDataFailed (WifiRemoteStation *st)
|
||||
void
|
||||
OnoeWifiManager::UpdateRetry (OnoeWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
station->m_tx_retr += station->m_shortRetry + station->m_longRetry;
|
||||
station->m_shortRetry = 0;
|
||||
station->m_longRetry = 0;
|
||||
@@ -164,6 +172,7 @@ OnoeWifiManager::UpdateRetry (OnoeWifiRemoteStation *station)
|
||||
void
|
||||
OnoeWifiManager::UpdateMode (OnoeWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
if (Simulator::Now () < station->m_nextModeUpdate)
|
||||
{
|
||||
return;
|
||||
@@ -246,6 +255,7 @@ OnoeWifiManager::UpdateMode (OnoeWifiRemoteStation *station)
|
||||
WifiTxVector
|
||||
OnoeWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
UpdateMode (station);
|
||||
NS_ASSERT (station->m_txrate < GetNSupported (station));
|
||||
@@ -305,6 +315,7 @@ OnoeWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
|
||||
WifiTxVector
|
||||
OnoeWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st);
|
||||
OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
|
||||
uint8_t channelWidth = GetChannelWidth (station);
|
||||
if (channelWidth > 20 && channelWidth != 22)
|
||||
|
||||
@@ -95,6 +95,7 @@ ParfWifiManager::~ParfWifiManager ()
|
||||
void
|
||||
ParfWifiManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
m_minPower = phy->GetTxPowerStart ();
|
||||
m_maxPower = phy->GetTxPowerEnd ();
|
||||
WifiRemoteStationManager::SetupPhy (phy);
|
||||
@@ -236,7 +237,6 @@ void ParfWifiManager::DoReportRtsOk (WifiRemoteStation *station,
|
||||
double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station << ctsSnr << ctsMode << rtsSnr);
|
||||
NS_LOG_DEBUG ("station=" << station << " rts ok");
|
||||
}
|
||||
|
||||
void ParfWifiManager::DoReportDataOk (WifiRemoteStation *st,
|
||||
@@ -348,7 +348,6 @@ ParfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
|
||||
bool
|
||||
ParfWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1004,12 +1004,10 @@ RegularWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
|
||||
}
|
||||
|
||||
void
|
||||
RegularWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket,
|
||||
const WifiMacHeader *hdr)
|
||||
RegularWifiMac::DeaggregateAmsduAndForward (Ptr<Packet> aggregatedPacket, const WifiMacHeader *hdr)
|
||||
{
|
||||
MsduAggregator::DeaggregatedMsdus packets =
|
||||
MsduAggregator::Deaggregate (aggregatedPacket);
|
||||
|
||||
NS_LOG_FUNCTION(this << aggregatedPacket << hdr);
|
||||
MsduAggregator::DeaggregatedMsdus packets = MsduAggregator::Deaggregate (aggregatedPacket);
|
||||
for (MsduAggregator::DeaggregatedMsdusCI i = packets.begin ();
|
||||
i != packets.end (); ++i)
|
||||
{
|
||||
|
||||
@@ -111,16 +111,18 @@ RraaWifiManager::RraaWifiManager ()
|
||||
: WifiRemoteStationManager (),
|
||||
m_currentRate (0)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
RraaWifiManager::~RraaWifiManager ()
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
void
|
||||
RraaWifiManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
uint8_t nModes = phy->GetNModes ();
|
||||
for (uint8_t i = 0; i < nModes; i++)
|
||||
{
|
||||
@@ -302,7 +304,6 @@ RraaWifiManager::DoReportRtsOk (WifiRemoteStation *st,
|
||||
double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st << ctsSnr << ctsMode << rtsSnr);
|
||||
NS_LOG_DEBUG ("self=" << st << " rts ok");
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -148,7 +148,7 @@ RrpaaWifiManager::AssignStreams (int64_t stream)
|
||||
void
|
||||
RrpaaWifiManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
m_nPowerLevels = phy->GetNTxPower ();
|
||||
m_maxPowerLevel = m_nPowerLevels - 1;
|
||||
m_minPowerLevel = 0;
|
||||
@@ -171,7 +171,7 @@ RrpaaWifiManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
void
|
||||
RrpaaWifiManager::SetupMac (const Ptr<WifiMac> mac)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
NS_LOG_FUNCTION (this << mac);
|
||||
m_sifs = mac->GetSifs ();
|
||||
m_difs = m_sifs + 2 * mac->GetSlot ();
|
||||
WifiRemoteStationManager::SetupMac (mac);
|
||||
@@ -272,8 +272,6 @@ void
|
||||
RrpaaWifiManager::InitThresholds (RrpaaWifiRemoteStation *station)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << station);
|
||||
NS_LOG_DEBUG ("InitThresholds = " << station);
|
||||
|
||||
double nextCritical = 0;
|
||||
double nextMtl = 0;
|
||||
double mtl = 0;
|
||||
@@ -348,7 +346,6 @@ RrpaaWifiManager::DoReportRtsOk (WifiRemoteStation *st,
|
||||
double ctsSnr, WifiMode ctsMode, double rtsSnr)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << st << ctsSnr << ctsMode << rtsSnr);
|
||||
NS_LOG_DEBUG ("self=" << st << " rts ok");
|
||||
}
|
||||
|
||||
void
|
||||
@@ -601,12 +598,9 @@ RrpaaWifiManager::GetThresholds (RrpaaWifiRemoteStation *station, uint8_t rate)
|
||||
bool
|
||||
RrpaaWifiManager::IsLowLatency (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
RrpaaWifiManager::SetHtSupported (bool enable)
|
||||
{
|
||||
|
||||
@@ -409,21 +409,25 @@ WifiRemoteStationManager::WifiRemoteStationManager ()
|
||||
m_shortSlotTimeEnabled (false),
|
||||
m_rifsPermitted (false)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
WifiRemoteStationManager::~WifiRemoteStationManager ()
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::DoDispose (void)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
Reset ();
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
//We need to track our PHY because it is the object that knows the
|
||||
//full set of transmit rates that are supported. We need to know
|
||||
//this in order to find the relevant mandatory rates when chosing a
|
||||
@@ -442,6 +446,7 @@ WifiRemoteStationManager::SetupPhy (const Ptr<WifiPhy> phy)
|
||||
void
|
||||
WifiRemoteStationManager::SetupMac (const Ptr<WifiMac> mac)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << mac);
|
||||
//We need to track our MAC because it is the object that knows the
|
||||
//full set of interframe spaces.
|
||||
m_wifiMac = mac;
|
||||
@@ -451,36 +456,42 @@ WifiRemoteStationManager::SetupMac (const Ptr<WifiMac> mac)
|
||||
void
|
||||
WifiRemoteStationManager::SetQosSupported (bool enable)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << enable);
|
||||
m_qosSupported = enable;
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetHtSupported (bool enable)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << enable);
|
||||
m_htSupported = enable;
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetMaxSsrc (uint32_t maxSsrc)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << maxSsrc);
|
||||
m_maxSsrc = maxSsrc;
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetMaxSlrc (uint32_t maxSlrc)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << maxSlrc);
|
||||
m_maxSlrc = maxSlrc;
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetRtsCtsThreshold (uint32_t threshold)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << threshold);
|
||||
m_rtsCtsThreshold = threshold;
|
||||
}
|
||||
|
||||
void
|
||||
WifiRemoteStationManager::SetFragmentationThreshold (uint32_t threshold)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << threshold);
|
||||
DoSetFragmentationThreshold (threshold);
|
||||
}
|
||||
|
||||
@@ -1438,7 +1449,6 @@ WifiRemoteStationManager::GetControlAnswerMode (Mac48Address address, WifiMode r
|
||||
//mandatory rates before we can be sure we've got the right one.
|
||||
found = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2261,6 +2271,7 @@ WifiRemoteStationInfo::WifiRemoteStationInfo ()
|
||||
m_lastUpdate (Seconds (0.0)),
|
||||
m_failAvg (0.0)
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
}
|
||||
|
||||
double
|
||||
|
||||
@@ -65,12 +65,14 @@ YansWifiChannel::~YansWifiChannel ()
|
||||
void
|
||||
YansWifiChannel::SetPropagationLossModel (const Ptr<PropagationLossModel> loss)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << loss);
|
||||
m_loss = loss;
|
||||
}
|
||||
|
||||
void
|
||||
YansWifiChannel::SetPropagationDelayModel (const Ptr<PropagationDelayModel> delay)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << delay);
|
||||
m_delay = delay;
|
||||
}
|
||||
|
||||
@@ -136,6 +138,7 @@ YansWifiChannel::GetDevice (uint32_t i) const
|
||||
void
|
||||
YansWifiChannel::Add (Ptr<YansWifiPhy> phy)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << phy);
|
||||
m_phyList.push_back (phy);
|
||||
}
|
||||
|
||||
|
||||
@@ -68,6 +68,7 @@ YansWifiPhy::GetChannel (void) const
|
||||
void
|
||||
YansWifiPhy::SetChannel (const Ptr<YansWifiChannel> channel)
|
||||
{
|
||||
NS_LOG_FUNCTION (this << channel);
|
||||
m_channel = channel;
|
||||
m_channel->Add (this);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user