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

wifi: Avoid repeated calculations by caching result

Browse Source
This commit is contained in:
Eduardo Almeida
2024-03-06 22:15:48 +00:00
parent d1aa4aa6fb
commit 51152a0ea5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/model/spectrum-wifi-phy.cc
View File

@@ -423,6 +423,8 @@ SpectrumWifiPhy::StartRx(Ptr<SpectrumSignalParameters> rxParams,
double totalRxPowerW = 0; double totalRxPowerW = 0;
RxPowerWattPerChannelBand rxPowerW; RxPowerWattPerChannelBand rxPowerW;
const auto rxGainRatio = DbToRatio(GetRxGain());
std::size_t index = 0; std::size_t index = 0;
uint16_t prevBw = 0; uint16_t prevBw = 0;
for (const auto& band : bands) for (const auto& band : bands)
@@ -434,7 +436,7 @@ SpectrumWifiPhy::StartRx(Ptr<SpectrumSignalParameters> rxParams,
WifiSpectrumValueHelper::GetBandPowerW(receivedSignalPsd, band.indices); WifiSpectrumValueHelper::GetBandPowerW(receivedSignalPsd, band.indices);
NS_LOG_DEBUG("Signal power received (watts) before antenna gain for " NS_LOG_DEBUG("Signal power received (watts) before antenna gain for "
<< bw << " MHz channel band " << index << ": " << band); << bw << " MHz channel band " << index << ": " << band);
rxPowerPerBandW *= DbToRatio(GetRxGain()); rxPowerPerBandW *= rxGainRatio;
rxPowerW.insert({band, rxPowerPerBandW}); rxPowerW.insert({band, rxPowerPerBandW});
NS_LOG_DEBUG("Signal power received after antenna gain for " NS_LOG_DEBUG("Signal power received after antenna gain for "
<< bw << " MHz channel band " << index << ": " << rxPowerPerBandW << " W (" << bw << " MHz channel band " << index << ": " << rxPowerPerBandW << " W ("
@@ -459,7 +461,7 @@ SpectrumWifiPhy::StartRx(Ptr<SpectrumSignalParameters> rxParams,
<< ru.GetRuType() << " and index " << ru.GetIndex() << " -> (" << ru.GetRuType() << " and index " << ru.GetIndex() << " -> ("
<< band.indices.first << "; " << band.indices.second << band.indices.first << "; " << band.indices.second
<< "): " << rxPowerPerBandW); << "): " << rxPowerPerBandW);
rxPowerPerBandW *= DbToRatio(GetRxGain()); rxPowerPerBandW *= rxGainRatio;
NS_LOG_DEBUG("Signal power received after antenna gain for RU with type " NS_LOG_DEBUG("Signal power received after antenna gain for RU with type "
<< ru.GetRuType() << " and index " << ru.GetIndex() << " -> (" << ru.GetRuType() << " and index " << ru.GetIndex() << " -> ("
<< band.indices.first << "; " << band.indices.second << "): " << band.indices.first << "; " << band.indices.second << "): "