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

wifi: Various fixes for ideal wifi manager

Browse Source
This commit is contained in:
Sébastien Deronne
2017-05-01 20:58:13 +02:00
parent bd2a27113a
commit f8da853565
2 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/wifi/examples/wifi-manager-example.cc
View File

@@ -164,6 +164,7 @@ int main (int argc, char *argv[])
std::string standard ("802.11a");
StandardInfo serverSelectedStandard;
StandardInfo clientSelectedStandard;
bool infrastructure = false;
CommandLine cmd;
cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
@@ -179,6 +180,7 @@ int main (int argc, char *argv[])
cmd.AddValue ("clientShortGuardInterval", "Set short guard interval of the client (802.11n/ac)", clientShortGuardInterval);
cmd.AddValue ("standard", "Set standard (802.11a, 802.11b, 802.11g, 802.11n-5GHz, 802.11n-2.4GHz, 802.11ac, 802.11-holland, 802.11-10MHz, 802.11-5MHz)", standard);
cmd.AddValue ("wifiManager", "Set wifi rate manager (Aarf, Aarfcd, Amrr, Arf, Cara, Ideal, Minstrel, MinstrelHt, Onoe, Rraa)", wifiManager);
cmd.AddValue ("infrastructure", "Use infrastructure instead of adhoc", infrastructure);
cmd.Parse (argc,argv);
if (standard == "802.11b")
@@ -326,12 +328,25 @@ int main (int argc, char *argv[])
NetDeviceContainer clientDevice;
WifiMacHelper wifiMac;
// Use Adhoc so we don't get into association issues
wifiMac.SetType ("ns3::AdhocWifiMac",
"BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
serverDevice = wifi.Install (wifiPhy, wifiMac, serverNode);
clientDevice = wifi.Install (wifiPhy, wifiMac, clientNode);
if (infrastructure)
{
Ssid ssid = Ssid ("ns-3-ssid");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
serverDevice = wifi.Install (wifiPhy, wifiMac, serverNode);
wifiMac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconGeneration", BooleanValue (true));
clientDevice = wifi.Install (wifiPhy, wifiMac, clientNode);
}
else
{
wifiMac.SetType ("ns3::AdhocWifiMac",
"BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
serverDevice = wifi.Install (wifiPhy, wifiMac, serverNode);
clientDevice = wifi.Install (wifiPhy, wifiMac, clientNode);
}
if (wifiManager == "MinstrelHt")
{

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

@@ -116,40 +116,43 @@ IdealWifiManager::DoInitialize ()
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
// Add all Ht and Vht MCSes
txVector.SetChannelWidth (GetPhy ()->GetChannelWidth ());
if (HasVhtSupported () == true || HasHtSupported () == true )
if (HasVhtSupported () == true || HasHtSupported () == true)
{
nModes = GetPhy ()->GetNMcs ();
for (uint32_t i = 0; i < nModes; i++)
{
mode = GetPhy ()->GetMcs (i);
if (mode.GetModulationClass () == WIFI_MOD_CLASS_HT)
for (uint16_t j = 20; j <= GetPhy ()->GetChannelWidth (); j*=2)
{
//derive NSS from the Mcs index
nss = (mode.GetMcsValue () / 8) + 1;
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName () <<
" channel width " << (uint16_t) GetPhy ()->GetChannelWidth () <<
" nss " << (uint16_t) nss <<
" short GI " << GetPhy ()->GetShortGuardInterval ());
NS_LOG_DEBUG ("In SetupPhy, adding mode = " << mode.GetUniqueName ());
txVector.SetNss (nss);
txVector.SetMode (mode);
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
else
{
uint8_t maxNss = GetPhy ()->GetMaxSupportedTxSpatialStreams ();
for (uint8_t i = 1; i <= maxNss; i++)
txVector.SetChannelWidth (j);
mode = GetPhy ()->GetMcs (i);
if (mode.GetModulationClass () == WIFI_MOD_CLASS_HT)
{
//derive NSS from the Mcs index
nss = (mode.GetMcsValue () / 8) + 1;
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName () <<
" channel width " << (uint16_t) GetPhy ()->GetChannelWidth () <<
" nss " << (uint16_t) i <<
" short GI " << GetPhy ()->GetShortGuardInterval ());
" nss " << (uint16_t) nss <<
" short GI " << j);
NS_LOG_DEBUG ("In SetupPhy, adding mode = " << mode.GetUniqueName ());
txVector.SetNss (i);
txVector.SetNss (nss);
txVector.SetMode (mode);
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
else //VHT
{
uint8_t maxNss = GetPhy ()->GetMaxSupportedTxSpatialStreams ();
for (uint8_t i = 1; i <= maxNss; i++)
{
NS_LOG_DEBUG ("Initialize, adding mode = " << mode.GetUniqueName () <<
" channel width " << (uint16_t) GetPhy ()->GetChannelWidth () <<
" nss " << (uint16_t) i <<
" short GI " << j);
NS_LOG_DEBUG ("In SetupPhy, adding mode = " << mode.GetUniqueName ());
txVector.SetNss (i);
txVector.SetMode (mode);
AddSnrThreshold (txVector, GetPhy ()->CalculateSnr (txVector, m_ber));
}
}
}
}
}
@@ -163,13 +166,14 @@ IdealWifiManager::GetSnrThreshold (WifiTxVector txVector) const
{
NS_LOG_DEBUG ("Checking " << i->second.GetMode ().GetUniqueName () <<
" nss " << (uint16_t) i->second.GetNss () <<
" GI " << i->second.GetGuardInterval () <<
" width " << (uint16_t) i->second.GetChannelWidth ());
NS_LOG_DEBUG ("against TxVector " << txVector.GetMode ().GetUniqueName () <<
" nss " << (uint16_t) txVector.GetNss () <<
" GI " << txVector.GetGuardInterval () <<
" width " << (uint16_t) txVector.GetChannelWidth ());
if (txVector.GetMode () == i->second.GetMode ()
&& txVector.GetNss () == i->second.GetNss ()
&& txVector.GetGuardInterval () == i->second.GetGuardInterval ()
&& txVector.GetChannelWidth () == i->second.GetChannelWidth ())
{
return i->first;
@@ -272,12 +276,13 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
//to ensure correct packet delivery.
double maxThreshold = 0.0;
WifiMode maxMode = GetDefaultMode ();
std::vector<WifiTxVector> candidateTxVectors;
WifiTxVector txVector;
WifiMode mode;
uint8_t selectedNss = 1;
txVector.SetChannelWidth (GetPhy ()->GetChannelWidth ());
txVector.SetGuardInterval (GetPhy ()->GetShortGuardInterval () ? 400 : 800);
uint8_t channelWidth = std::min (GetChannelWidth (station), GetPhy ()->GetChannelWidth ());
uint16_t guardInterval = std::max (GetShortGuardInterval (station) ? 400 : 800, GetPhy ()->GetShortGuardInterval () ? 400 : 800);
txVector.SetChannelWidth (channelWidth);
txVector.SetGuardInterval (guardInterval);
if (station->m_lastSnrObserved == station->m_lastSnrCached)
{
// SNR has not changed, so skip the search and use the last
@@ -405,14 +410,13 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
station->m_lastMode = maxMode;
station->m_nss = selectedNss;
}
uint8_t channelWidth = GetChannelWidth (station);
NS_LOG_DEBUG ("Found maxMode: " << maxMode << " channelWidth: " << (uint16_t) channelWidth);
if (m_currentRate != maxMode.GetDataRate (channelWidth, GetPhy ()->GetShortGuardInterval () ? 400 : 800, selectedNss))
if (m_currentRate != maxMode.GetDataRate (channelWidth, guardInterval, selectedNss))
{
NS_LOG_DEBUG ("New datarate: " << maxMode.GetDataRate (channelWidth, GetPhy ()->GetShortGuardInterval () ? 400 : 800, selectedNss));
m_currentRate = maxMode.GetDataRate (channelWidth, GetPhy ()->GetShortGuardInterval () ? 400 : 800, selectedNss);
NS_LOG_DEBUG ("New datarate: " << maxMode.GetDataRate (channelWidth, guardInterval, selectedNss));
m_currentRate = maxMode.GetDataRate (channelWidth, guardInterval, selectedNss);
}
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (maxMode, GetAddress (station)), 800, GetNumberOfAntennas (), selectedNss, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (maxMode, GetAddress (station)), guardInterval, GetNumberOfAntennas (), selectedNss, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector