diff --git a/src/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc index 03d1c5b86..67709ce93 100644 --- a/src/wifi/helper/wifi-helper.cc +++ b/src/wifi/helper/wifi-helper.cc @@ -577,6 +577,8 @@ WifiPhyHelper::GetPcapDataLinkType (void) const void WifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr 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. diff --git a/src/wifi/model/aarf-wifi-manager.cc b/src/wifi/model/aarf-wifi-manager.cc index 2a8ac3311..3cad61305 100644 --- a/src/wifi/model/aarf-wifi-manager.cc +++ b/src/wifi/model/aarf-wifi-manager.cc @@ -283,7 +283,6 @@ AarfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st) bool AarfWifiManager::IsLowLatency (void) const { - NS_LOG_FUNCTION (this); return true; } diff --git a/src/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc index 3e3fe1d0e..774c0dd94 100644 --- a/src/wifi/model/aarfcd-wifi-manager.cc +++ b/src/wifi/model/aarfcd-wifi-manager.cc @@ -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; } diff --git a/src/wifi/model/amrr-wifi-manager.cc b/src/wifi/model/amrr-wifi-manager.cc index 7b1ae3044..fad3623f6 100644 --- a/src/wifi/model/amrr-wifi-manager.cc +++ b/src/wifi/model/amrr-wifi-manager.cc @@ -390,7 +390,6 @@ AmrrWifiManager::DoGetRtsTxVector (WifiRemoteStation *st) bool AmrrWifiManager::IsLowLatency (void) const { - NS_LOG_FUNCTION (this); return true; } diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 03c75008c..d7586509f 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -1185,13 +1185,10 @@ ApWifiMac::Receive (Ptr packet, const WifiMacHeader *hdr) } void -ApWifiMac::DeaggregateAmsduAndForward (Ptr aggregatedPacket, - const WifiMacHeader *hdr) +ApWifiMac::DeaggregateAmsduAndForward (Ptr 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) { diff --git a/src/wifi/model/aparf-wifi-manager.cc b/src/wifi/model/aparf-wifi-manager.cc index bb844a423..0c0e0747a 100644 --- a/src/wifi/model/aparf-wifi-manager.cc +++ b/src/wifi/model/aparf-wifi-manager.cc @@ -127,6 +127,7 @@ AparfWifiManager::~AparfWifiManager () void AparfWifiManager::SetupPhy (const Ptr 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; } diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 7c8f34850..2ea20aad0 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -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; } diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index 0a59cc240..0480eecee 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -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; } diff --git a/src/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc index b7b8db530..ec7a1eabc 100644 --- a/src/wifi/model/constant-rate-wifi-manager.cc +++ b/src/wifi/model/constant-rate-wifi-manager.cc @@ -130,7 +130,6 @@ ConstantRateWifiManager::DoGetRtsTxVector (WifiRemoteStation *st) bool ConstantRateWifiManager::IsLowLatency (void) const { - NS_LOG_FUNCTION (this); return true; } diff --git a/src/wifi/model/dcf-manager.cc b/src/wifi/model/dcf-manager.cc index ef36f7c4f..14d3f367d 100644 --- a/src/wifi/model/dcf-manager.cc +++ b/src/wifi/model/dcf-manager.cc @@ -117,6 +117,7 @@ DcfManager::DcfManager () DcfManager::~DcfManager () { + NS_LOG_FUNCTION (this); delete m_phyListener; m_phyListener = 0; } diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index 5409ae68f..0de2dc521 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -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 diff --git a/src/wifi/model/minstrel-ht-wifi-manager.cc b/src/wifi/model/minstrel-ht-wifi-manager.cc index d79f4a923..146c9e337 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/minstrel-ht-wifi-manager.cc @@ -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); diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index 2e37c6514..5f16941d6 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -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, Ptrm_nModes; i++) { NS_LOG_DEBUG ("Initializing rate index " << static_cast(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++) diff --git a/src/wifi/model/onoe-wifi-manager.cc b/src/wifi/model/onoe-wifi-manager.cc index 07a3fa152..491150dba 100644 --- a/src/wifi/model/onoe-wifi-manager.cc +++ b/src/wifi/model/onoe-wifi-manager.cc @@ -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) diff --git a/src/wifi/model/parf-wifi-manager.cc b/src/wifi/model/parf-wifi-manager.cc index 786c08ba2..0c0e40a8f 100644 --- a/src/wifi/model/parf-wifi-manager.cc +++ b/src/wifi/model/parf-wifi-manager.cc @@ -95,6 +95,7 @@ ParfWifiManager::~ParfWifiManager () void ParfWifiManager::SetupPhy (const Ptr 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; } diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc index d2cb30e63..a75dc98be 100644 --- a/src/wifi/model/regular-wifi-mac.cc +++ b/src/wifi/model/regular-wifi-mac.cc @@ -1004,12 +1004,10 @@ RegularWifiMac::Receive (Ptr packet, const WifiMacHeader *hdr) } void -RegularWifiMac::DeaggregateAmsduAndForward (Ptr aggregatedPacket, - const WifiMacHeader *hdr) +RegularWifiMac::DeaggregateAmsduAndForward (Ptr 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) { diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index e090e1310..38d4a8a9c 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -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 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 diff --git a/src/wifi/model/rrpaa-wifi-manager.cc b/src/wifi/model/rrpaa-wifi-manager.cc index 0a7bbeca2..7ef3a5c00 100644 --- a/src/wifi/model/rrpaa-wifi-manager.cc +++ b/src/wifi/model/rrpaa-wifi-manager.cc @@ -148,7 +148,7 @@ RrpaaWifiManager::AssignStreams (int64_t stream) void RrpaaWifiManager::SetupPhy (const Ptr 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 phy) void RrpaaWifiManager::SetupMac (const Ptr 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) { diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index bc4687217..0e310ab72 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -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 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 phy) void WifiRemoteStationManager::SetupMac (const Ptr 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 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 diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index c409c3de2..5414f099a 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -65,12 +65,14 @@ YansWifiChannel::~YansWifiChannel () void YansWifiChannel::SetPropagationLossModel (const Ptr loss) { + NS_LOG_FUNCTION (this << loss); m_loss = loss; } void YansWifiChannel::SetPropagationDelayModel (const Ptr delay) { + NS_LOG_FUNCTION (this << delay); m_delay = delay; } @@ -136,6 +138,7 @@ YansWifiChannel::GetDevice (uint32_t i) const void YansWifiChannel::Add (Ptr phy) { + NS_LOG_FUNCTION (this << phy); m_phyList.push_back (phy); } diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index de25ab91f..32cb4c31e 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -68,6 +68,7 @@ YansWifiPhy::GetChannel (void) const void YansWifiPhy::SetChannel (const Ptr channel) { + NS_LOG_FUNCTION (this << channel); m_channel = channel; m_channel->Add (this); }