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

wifi: Store frequency and channel width in WifiPpdu in order to avoid passing them to retrieve the TxVector and the TxDuration

Browse Source
This commit is contained in:
Sébastien Deronne
2019-06-02 11:34:44 +02:00
parent 5650d548df
commit 9fc403480d
6 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,13 +316,13 @@ void
SpectrumWifiPhy::StartTx (Ptr<WifiPpdu> ppdu)
{
NS_LOG_FUNCTION (this << ppdu);
WifiTxVector txVector = ppdu->GetTxVector (GetChannelWidth ());
WifiTxVector txVector = ppdu->GetTxVector ();
double txPowerDbm = GetTxPowerForTransmission (txVector) + GetTxGain ();
NS_LOG_DEBUG ("Start transmission: signal power before antenna gain=" << txPowerDbm << "dBm");
double txPowerWatts = DbmToW (txPowerDbm);
Ptr<SpectrumValue> txPowerSpectrum = GetTxPowerSpectralDensity (GetCenterFrequencyForChannelWidth (txVector), txVector.GetChannelWidth (), txPowerWatts, txVector.GetMode ().GetModulationClass ());
Ptr<WifiSpectrumSignalParameters> txParams = Create<WifiSpectrumSignalParameters> ();
txParams->duration = ppdu->GetTxDuration (GetFrequency (), GetChannelWidth ());
txParams->duration = ppdu->GetTxDuration ();
txParams->psd = txPowerSpectrum;
NS_ASSERT_MSG (m_wifiSpectrumPhyInterface, "SpectrumPhy() is not set; maybe forgot to call CreateWifiSpectrumPhyInterface?");
txParams->txPhy = m_wifiSpectrumPhyInterface->GetObject<SpectrumPhy> ();

4
src/wifi/model/wifi-phy.cc
View File

@@ -2659,8 +2659,8 @@ void
WifiPhy::StartReceivePreamble (Ptr<WifiPpdu> ppdu, double rxPowerW)
{
NS_LOG_FUNCTION (this << *ppdu << rxPowerW);
WifiTxVector txVector = ppdu->GetTxVector (GetChannelWidth ());
Time rxDuration = ppdu->GetTxDuration (GetFrequency (), txVector.GetChannelWidth ());
WifiTxVector txVector = ppdu->GetTxVector ();
Time rxDuration = ppdu->GetTxDuration ();
Ptr<const WifiPsdu> psdu = ppdu->GetPsdu ();
Ptr<Event> event = m_interference.Add (ppdu, txVector, rxDuration, rxPowerW);

50
src/wifi/model/wifi-ppdu.cc
View File

@@ -33,7 +33,9 @@ WifiPpdu::WifiPpdu (Ptr<const WifiPsdu> psdu, WifiTxVector txVector, Time ppduDu
: m_preamble (txVector.GetPreambleType ()),
m_modulation (txVector.IsValid () ? txVector.GetMode ().GetModulationClass () : WIFI_MOD_CLASS_UNKNOWN),
m_psdu (psdu),
m_truncatedTx (false)
m_truncatedTx (false),
m_frequency (frequency),
m_channelWidth (txVector.GetChannelWidth ())
{
NS_LOG_FUNCTION (this << psdu << txVector << ppduDuration << frequency);
if (!txVector.IsValid ())
@@ -53,7 +55,7 @@ WifiPpdu::WifiPpdu (Ptr<const WifiPsdu> psdu, WifiTxVector txVector, Time ppduDu
case WIFI_MOD_CLASS_OFDM:
case WIFI_MOD_CLASS_ERP_OFDM:
{
m_lSig.SetRate (txVector.GetMode ().GetDataRate (txVector), txVector.GetChannelWidth ());
m_lSig.SetRate (txVector.GetMode ().GetDataRate (txVector), m_channelWidth);
m_lSig.SetLength (psdu->GetSize ());
break;
}
@@ -67,7 +69,7 @@ WifiPpdu::WifiPpdu (Ptr<const WifiPsdu> psdu, WifiTxVector txVector, Time ppduDu
uint16_t length = ((ceil ((static_cast<double> (ppduDuration.GetNanoSeconds () - (20 * 1000) - (sigExtension * 1000)) / 1000) / 4.0) * 3) - 3);
m_lSig.SetLength (length);
m_htSig.SetMcs (txVector.GetMode ().GetMcsValue ());
m_htSig.SetChannelWidth (txVector.GetChannelWidth ());
m_htSig.SetChannelWidth (m_channelWidth);
m_htSig.SetHtLength (psdu->GetSize ());
m_htSig.SetAggregation (txVector.IsAggregation ());
m_htSig.SetShortGuardInterval (txVector.GetGuardInterval () == 400);
@@ -78,7 +80,7 @@ WifiPpdu::WifiPpdu (Ptr<const WifiPsdu> psdu, WifiTxVector txVector, Time ppduDu
uint16_t length = ((ceil ((static_cast<double> (ppduDuration.GetNanoSeconds () - (20 * 1000)) / 1000) / 4.0) * 3) - 3);
m_lSig.SetLength (length);
m_vhtSig.SetMuFlag (m_preamble == WIFI_PREAMBLE_VHT_MU);
m_vhtSig.SetChannelWidth (txVector.GetChannelWidth ());
m_vhtSig.SetChannelWidth (m_channelWidth);
m_vhtSig.SetShortGuardInterval (txVector.GetGuardInterval () == 400);
uint32_t nSymbols = (static_cast<double> ((ppduDuration - WifiPhy::CalculatePlcpPreambleAndHeaderDuration (txVector)).GetNanoSeconds ()) / (3200 + txVector.GetGuardInterval ()));
if (txVector.GetGuardInterval () == 400)
@@ -110,7 +112,7 @@ WifiPpdu::WifiPpdu (Ptr<const WifiPsdu> psdu, WifiTxVector txVector, Time ppduDu
m_heSig.SetMuFlag (m_preamble == WIFI_PREAMBLE_HE_MU);
m_heSig.SetMcs (txVector.GetMode ().GetMcsValue ());
m_heSig.SetBssColor (txVector.GetBssColor ());
m_heSig.SetChannelWidth (txVector.GetChannelWidth ());
m_heSig.SetChannelWidth (m_channelWidth);
m_heSig.SetGuardIntervalAndLtfSize (txVector.GetGuardInterval (), 2/*NLTF currently unused*/);
m_heSig.SetNStreams (txVector.GetNss ());
break;
@@ -126,7 +128,7 @@ WifiPpdu::~WifiPpdu ()
}
WifiTxVector
WifiPpdu::GetTxVector (uint16_t channelWidth) const
WifiPpdu::GetTxVector (void) const
{
WifiTxVector txVector;
txVector.SetPreambleType (m_preamble);
@@ -161,7 +163,7 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
case WIFI_MOD_CLASS_OFDM:
{
WifiMode mode;
switch (m_lSig.GetRate (channelWidth))
switch (m_lSig.GetRate (m_channelWidth))
{
case 1500000:
mode = WifiPhy::GetOfdmRate1_5MbpsBW5MHz ();
@@ -170,17 +172,17 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
mode = WifiPhy::GetOfdmRate2_25MbpsBW5MHz ();
break;
case 3000000:
mode = (channelWidth == 5) ? WifiPhy::GetOfdmRate3MbpsBW5MHz () : WifiPhy::GetOfdmRate3MbpsBW10MHz ();
mode = (m_channelWidth == 5) ? WifiPhy::GetOfdmRate3MbpsBW5MHz () : WifiPhy::GetOfdmRate3MbpsBW10MHz ();
break;
case 4500000:
mode = (channelWidth == 5) ? WifiPhy::GetOfdmRate4_5MbpsBW5MHz () : WifiPhy::GetOfdmRate4_5MbpsBW10MHz ();
mode = (m_channelWidth == 5) ? WifiPhy::GetOfdmRate4_5MbpsBW5MHz () : WifiPhy::GetOfdmRate4_5MbpsBW10MHz ();
break;
case 6000000:
if (channelWidth == 5)
if (m_channelWidth == 5)
{
mode = WifiPhy::GetOfdmRate6MbpsBW5MHz ();
}
else if (channelWidth == 10)
else if (m_channelWidth == 10)
{
mode = WifiPhy::GetOfdmRate6MbpsBW10MHz ();
}
@@ -190,11 +192,11 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
}
break;
case 9000000:
if (channelWidth == 5)
if (m_channelWidth == 5)
{
mode = WifiPhy::GetOfdmRate9MbpsBW5MHz ();
}
else if (channelWidth == 10)
else if (m_channelWidth == 10)
{
mode = WifiPhy::GetOfdmRate9MbpsBW10MHz ();
}
@@ -204,11 +206,11 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
}
break;
case 12000000:
if (channelWidth == 5)
if (m_channelWidth == 5)
{
mode = WifiPhy::GetOfdmRate12MbpsBW5MHz ();
}
else if (channelWidth == 10)
else if (m_channelWidth == 10)
{
mode = WifiPhy::GetOfdmRate12MbpsBW10MHz ();
}
@@ -221,10 +223,10 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
mode = WifiPhy::GetOfdmRate13_5MbpsBW5MHz ();
break;
case 18000000:
mode = (channelWidth == 10) ? WifiPhy::GetOfdmRate18MbpsBW10MHz () : WifiPhy::GetOfdmRate18Mbps ();
mode = (m_channelWidth == 10) ? WifiPhy::GetOfdmRate18MbpsBW10MHz () : WifiPhy::GetOfdmRate18Mbps ();
break;
case 24000000:
mode = (channelWidth == 10) ? WifiPhy::GetOfdmRate24MbpsBW10MHz () : WifiPhy::GetOfdmRate24Mbps ();
mode = (m_channelWidth == 10) ? WifiPhy::GetOfdmRate24MbpsBW10MHz () : WifiPhy::GetOfdmRate24Mbps ();
break;
case 27000000:
mode = WifiPhy::GetOfdmRate27MbpsBW10MHz ();
@@ -244,7 +246,7 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
}
txVector.SetMode (mode);
//OFDM uses 20 MHz, unless PHY channel width is 5 MHz or 10 Mhz
txVector.SetChannelWidth (channelWidth < 20 ? channelWidth : 20);
txVector.SetChannelWidth (m_channelWidth < 20 ? m_channelWidth : 20);
break;
}
case WIFI_MOD_CLASS_ERP_OFDM:
@@ -282,7 +284,7 @@ WifiPpdu::GetTxVector (uint16_t channelWidth) const
}
txVector.SetMode (mode);
//ERP-OFDM uses 20 MHz, unless PHY channel width is 5 MHz or 10 Mhz
txVector.SetChannelWidth (channelWidth < 20 ? channelWidth : 20);
txVector.SetChannelWidth (m_channelWidth < 20 ? m_channelWidth : 20);
break;
}
case WIFI_MOD_CLASS_HT:
@@ -523,10 +525,10 @@ WifiPpdu::SetTruncatedTx (void)
}
Time
WifiPpdu::GetTxDuration (uint16_t frequency, uint16_t channelWidth) const
WifiPpdu::GetTxDuration (void) const
{
Time ppduDuration = Seconds (0);
WifiTxVector txVector = GetTxVector (channelWidth);
WifiTxVector txVector = GetTxVector ();
switch (m_modulation)
{
case WIFI_MOD_CLASS_DSSS:
@@ -535,10 +537,10 @@ WifiPpdu::GetTxDuration (uint16_t frequency, uint16_t channelWidth) const
break;
case WIFI_MOD_CLASS_OFDM:
case WIFI_MOD_CLASS_ERP_OFDM:
ppduDuration = WifiPhy::CalculateTxDuration (m_lSig.GetLength (), txVector, frequency);
ppduDuration = WifiPhy::CalculateTxDuration (m_lSig.GetLength (), txVector, m_frequency);
break;
case WIFI_MOD_CLASS_HT:
ppduDuration = WifiPhy::CalculateTxDuration (m_htSig.GetHtLength (), txVector, frequency);
ppduDuration = WifiPhy::CalculateTxDuration (m_htSig.GetHtLength (), txVector, m_frequency);
break;
case WIFI_MOD_CLASS_VHT:
{
@@ -558,7 +560,7 @@ WifiPpdu::GetTxDuration (uint16_t frequency, uint16_t channelWidth) const
Time tSymbol = NanoSeconds (12800 + txVector.GetGuardInterval ());
Time preambleDuration = WifiPhy::CalculatePlcpPreambleAndHeaderDuration (txVector);
uint8_t sigExtension = 0;
if (Is2_4Ghz (frequency))
if (Is2_4Ghz (m_frequency))
{
sigExtension = 6;
}

9
src/wifi/model/wifi-ppdu.h
View File

@@ -53,10 +53,9 @@ public:
/**
* Get the TXVECTOR used to send the PPDU.
* \param channelWidth the maximum channel width supported by the PHY.
* \return the TXVECTOR of the PPDU.
*/
WifiTxVector GetTxVector (uint16_t channelWidth) const;
WifiTxVector GetTxVector (void) const;
/**
* Get the payload of the PPDU.
* \return the PSDU
@@ -73,11 +72,9 @@ public:
void SetTruncatedTx (void);
/**
* Get the total transmission duration of the PPDU.
* \param frequency the frequency used by the PHY.
* \param channelWidth the maximum channel width supported by the PHY.
* \return the transmission duration of the PPDU
*/
Time GetTxDuration (uint16_t frequency, uint16_t channelWidth) const;
Time GetTxDuration () const;
/**
* \brief Print the PPDU contents.
@@ -95,6 +92,8 @@ private:
WifiModulationClass m_modulation; //!< the modulation used for the transmission of this PPDU
Ptr<const WifiPsdu> m_psdu; //!< the PSDU contained in this PPDU
bool m_truncatedTx; //!< flag indicating whether the frame's transmission was aborted due to transmitter switch off
uint16_t m_frequency; //!< the frequency used to transmit that PPDU
uint16_t m_channelWidth; //!< the channel width used to transmit that PPDU
};
/**

2
src/wifi/model/yans-wifi-phy.cc
View File

@@ -78,7 +78,7 @@ void
YansWifiPhy::StartTx (Ptr<WifiPpdu> ppdu)
{
NS_LOG_FUNCTION (this << ppdu);
WifiTxVector txVector = ppdu->GetTxVector (GetChannelWidth ());
WifiTxVector txVector = ppdu->GetTxVector ();
NS_LOG_DEBUG ("Start transmission: signal power before antenna gain=" << GetPowerDbm (txVector.GetTxPowerLevel ()) << "dBm");
m_channel->Send (this, ppdu, GetTxPowerForTransmission (txVector) + GetTxGain ());
}

2
src/wifi/test/wifi-test.cc
View File

@@ -1393,7 +1393,7 @@ Bug2843TestCase::StoreDistinctTuple (std::string context, Ptr<SpectrumSignalPar
Ptr<const WifiSpectrumSignalParameters> wifiTxParams = DynamicCast<WifiSpectrumSignalParameters> (txParams);
Ptr<WifiPpdu> ppdu = Copy (wifiTxParams->ppdu);
WifiTxVector txVector = ppdu->GetTxVector (20);
WifiTxVector txVector = ppdu->GetTxVector ();
m_channelWidth = txVector.GetChannelWidth ();
WifiModulationClass modulationClass = txVector.GetMode ().GetModulationClass ();