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

wifi: Rebuild SNR thresholds in Ideal rate manager if PHY capabilities have changed

Browse Source
This commit is contained in:
Sébastien Deronne
2020-05-15 08:22:05 +02:00
parent 3314e53c0d
commit 177030ced5
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/wifi/model/ideal-wifi-manager.cc
View File

@@ -106,6 +106,13 @@ void
IdealWifiManager::DoInitialize ()
{
NS_LOG_FUNCTION (this);
BuildSnrThresholds ();
}
void
IdealWifiManager::BuildSnrThresholds (void)
{
m_thresholds.clear ();
WifiMode mode;
WifiTxVector txVector;
uint8_t nss = 1;
@@ -116,7 +123,7 @@ IdealWifiManager::DoInitialize ()
txVector.SetChannelWidth (GetChannelWidthForNonHtMode (mode));
txVector.SetNss (nss);
txVector.SetMode (mode);
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName ());
NS_LOG_DEBUG ("Adding mode = " << mode.GetUniqueName ());
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
// Add all MCSes
@@ -135,11 +142,10 @@ IdealWifiManager::DoInitialize ()
txVector.SetGuardInterval (guardInterval);
//derive NSS from the MCS index
nss = (mode.GetMcsValue () / 8) + 1;
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName () <<
NS_LOG_DEBUG ("Adding mode = " << mode.GetUniqueName () <<
" channel width " << j <<
" nss " << +nss <<
" GI " << guardInterval);
NS_LOG_DEBUG ("In SetupPhy, adding mode = " << mode.GetUniqueName ());
txVector.SetNss (nss);
txVector.SetMode (mode);
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
@@ -158,20 +164,19 @@ IdealWifiManager::DoInitialize ()
txVector.SetGuardInterval (guardInterval);
for (uint8_t k = 1; k <= GetPhy ()->GetMaxSupportedTxSpatialStreams (); k++)
{
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName () <<
" channel width " << j <<
" nss " << +k <<
" GI " << guardInterval);
if (mode.IsAllowed (j, k))
{
NS_LOG_DEBUG ("In SetupPhy, adding mode = " << mode.GetUniqueName ());
NS_LOG_DEBUG ("Adding mode = " << mode.GetUniqueName () <<
" channel width " << j <<
" nss " << +k <<
" GI " << guardInterval);
txVector.SetNss (k);
txVector.SetMode (mode);
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
else
{
NS_LOG_DEBUG ("In SetupPhy, mode = " << mode.GetUniqueName () << " disallowed");
NS_LOG_DEBUG ("Mode = " << mode.GetUniqueName () << " disallowed");
}
}
}
@@ -181,28 +186,26 @@ IdealWifiManager::DoInitialize ()
}
double
IdealWifiManager::GetSnrThreshold (WifiTxVector txVector) const
IdealWifiManager::GetSnrThreshold (WifiTxVector txVector)
{
NS_LOG_FUNCTION (this << txVector.GetMode ().GetUniqueName ());
for (Thresholds::const_iterator i = m_thresholds.begin (); i != m_thresholds.end (); i++)
NS_LOG_FUNCTION (this << txVector);
auto it = std::find_if (m_thresholds.begin (), m_thresholds.end (),
[&txVector] (const std::pair<double, WifiTxVector>& p) -> bool {
return ((txVector.GetMode () == p.second.GetMode ()) && (txVector.GetNss () == p.second.GetNss ()) && (txVector.GetChannelWidth () == p.second.GetChannelWidth ()));
}
);
if (it == m_thresholds.end ())
{
NS_LOG_DEBUG ("Checking " << i->second.GetMode ().GetUniqueName () <<
" nss " << +i->second.GetNss () <<
" GI " << i->second.GetGuardInterval () <<
" width " << i->second.GetChannelWidth ());
NS_LOG_DEBUG ("against TxVector " << txVector.GetMode ().GetUniqueName () <<
" nss " << +txVector.GetNss () <<
" GI " << txVector.GetGuardInterval () <<
" width " << txVector.GetChannelWidth ());
if (txVector.GetMode () == i->second.GetMode ()
&& txVector.GetNss () == i->second.GetNss ()
&& txVector.GetChannelWidth () == i->second.GetChannelWidth ())
{
return i->first;
}
}
NS_ASSERT (false);
return 0.0;
//This means capabilities have changed in runtime, hence rebuild SNR thresholds
BuildSnrThresholds ();
it = std::find_if (m_thresholds.begin (), m_thresholds.end (),
[&txVector] (const std::pair<double, WifiTxVector>& p) -> bool {
return ((txVector.GetMode () == p.second.GetMode ()) && (txVector.GetNss () == p.second.GetNss ()) && (txVector.GetChannelWidth () == p.second.GetChannelWidth ()));
}
);
NS_ASSERT_MSG (it != m_thresholds.end (), "SNR threshold not found");
}
return it->first;
}
void

9
src/wifi/model/ideal-wifi-manager.h
View File

@@ -83,6 +83,13 @@ private:
*/
void Reset (WifiRemoteStation *station) const;
/**
* Construct the vector of minimum SNRs needed to successfully transmit for
* all possible combinations (rate, channel width, nss) based on PHY capabilities.
* This is called at initialization and if PHY capabilities changed.
*/
void BuildSnrThresholds (void);
/**
* Return the minimum SNR needed to successfully transmit
* data with this WifiTxVector at the specified BER.
@@ -91,7 +98,7 @@ private:
*
* \return the minimum SNR for the given WifiTxVector in linear scale
*/
double GetSnrThreshold (WifiTxVector txVector) const;
double GetSnrThreshold (WifiTxVector txVector);
/**
* Adds a pair of WifiTxVector and the minimum SNR for that given vector
* to the list.