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

wifi: Add support for flow control and BQL

Browse Source
This commit is contained in:
Stefano Avallone
2017-03-08 18:02:07 +01:00
parent bdc94e40b1
commit b51598d076
2 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/wifi/model/wifi-net-device.cc
View File

@@ -21,6 +21,7 @@
#include "wifi-net-device.h"
#include "wifi-phy.h"
#include "regular-wifi-mac.h"
#include "wifi-mac-queue.h"
#include "ns3/llc-snap-header.h"
#include "ns3/socket.h"
#include "ns3/pointer.h"
@@ -136,35 +137,71 @@ WifiNetDevice::NotifyNewAggregate (void)
if (ndqi != 0)
{
m_queueInterface = ndqi;
if (m_mac == 0)
{
NS_LOG_WARN ("A mac has not been installed yet, using a single tx queue");
}
else
{
Ptr<RegularWifiMac> mac = DynamicCast<RegularWifiMac> (m_mac);
if (mac != 0)
{
BooleanValue qosSupported;
mac->GetAttributeFailSafe ("QosSupported", qosSupported);
if (qosSupported.Get ())
{
m_queueInterface->SetTxQueuesN (4);
// register the select queue callback
m_queueInterface->SetSelectQueueCallback (MakeCallback (&WifiNetDevice::SelectQueue, this));
}
}
}
// register the select queue callback
m_queueInterface->SetSelectQueueCallback (MakeCallback (&WifiNetDevice::SelectQueue, this));
m_queueInterface->SetLateTxQueuesCreation (true);
FlowControlConfig ();
}
}
NetDevice::NotifyNewAggregate ();
}
void
WifiNetDevice::FlowControlConfig (void)
{
if (m_mac == 0 || m_queueInterface == 0)
{
return;
}
Ptr<RegularWifiMac> mac = DynamicCast<RegularWifiMac> (m_mac);
if (mac == 0)
{
NS_LOG_WARN ("Flow control is only supported by RegularWifiMac");
return;
}
BooleanValue qosSupported;
mac->GetAttributeFailSafe ("QosSupported", qosSupported);
PointerValue ptr;
Ptr<WifiMacQueue> wmq;
if (qosSupported.Get ())
{
m_queueInterface->SetTxQueuesN (4);
m_queueInterface->CreateTxQueues ();
mac->GetAttributeFailSafe ("BE_EdcaTxopN", ptr);
wmq = ptr.Get<EdcaTxopN> ()->GetQueue ();
m_queueInterface->ConnectQueueTraces<WifiMacQueueItem> (wmq, 0);
mac->GetAttributeFailSafe ("BK_EdcaTxopN", ptr);
wmq = ptr.Get<EdcaTxopN> ()->GetQueue ();
m_queueInterface->ConnectQueueTraces<WifiMacQueueItem> (wmq, 1);
mac->GetAttributeFailSafe ("VI_EdcaTxopN", ptr);
wmq = ptr.Get<EdcaTxopN> ()->GetQueue ();
m_queueInterface->ConnectQueueTraces<WifiMacQueueItem> (wmq, 2);
mac->GetAttributeFailSafe ("VO_EdcaTxopN", ptr);
wmq = ptr.Get<EdcaTxopN> ()->GetQueue ();
m_queueInterface->ConnectQueueTraces<WifiMacQueueItem> (wmq, 3);
}
else
{
m_queueInterface->CreateTxQueues ();
mac->GetAttributeFailSafe ("DcaTxop", ptr);
wmq = ptr.Get<DcaTxop> ()->GetQueue ();
m_queueInterface->ConnectQueueTraces<WifiMacQueueItem> (wmq, 0);
}
}
void
WifiNetDevice::SetMac (Ptr<WifiMac> mac)
{
m_mac = mac;
CompleteConfig ();
FlowControlConfig ();
}
void

4
src/wifi/model/wifi-net-device.h
View File

@@ -150,6 +150,10 @@ private:
* connecting all lower components (e.g. MAC, WifiRemoteStation) together.
*/
void CompleteConfig (void);
/**
* Perform the actions needed to support flow control and dynamic queue limits
*/
void FlowControlConfig (void);
/**
* \brief Determine the tx queue for a given packet