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

wifi: Optionally specify the link ID for the next queue to serve

Browse Source
This commit is contained in:
Stefano Avallone
2023-07-19 16:49:59 +02:00
committed by Stefano Avallone
parent 61a6921a89
commit 4cd1c9d4e4
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/wifi/model/wifi-mac-queue-scheduler-impl.h
View File

@@ -66,11 +66,14 @@ class WifiMacQueueSchedulerImpl : public WifiMacQueueScheduler
/** \copydoc ns3::WifiMacQueueScheduler::SetWifiMac */
void SetWifiMac(Ptr<WifiMac> mac) final;
/** \copydoc ns3::WifiMacQueueScheduler::GetNext(AcIndex,uint8_t) */
std::optional<WifiContainerQueueId> GetNext(AcIndex ac, uint8_t linkId) final;
/** \copydoc ns3::WifiMacQueueScheduler::GetNext(AcIndex,uint8_t,const WifiContainerQueueId&) */
/** \copydoc ns3::WifiMacQueueScheduler::GetNext(AcIndex,std::optional<uint8_t>) */
std::optional<WifiContainerQueueId> GetNext(AcIndex ac, std::optional<uint8_t> linkId) final;
/**
* \copydoc ns3::WifiMacQueueScheduler::GetNext(AcIndex,std::optional<uint8_t>,
* const WifiContainerQueueId&)
*/
std::optional<WifiContainerQueueId> GetNext(AcIndex ac,
uint8_t linkId,
std::optional<uint8_t> linkId,
const WifiContainerQueueId& prevQueueId) final;
/** \copydoc ns3::WifiMacQueueScheduler::GetLinkIds */
std::list<uint8_t> GetLinkIds(AcIndex ac, Ptr<const WifiMpdu> mpdu) final;
@@ -202,12 +205,13 @@ class WifiMacQueueSchedulerImpl : public WifiMacQueueScheduler
* Queues containing MPDUs that cannot be sent over the given link are ignored.
*
* \param ac the Access Category that we want to serve
* \param linkId the ID of the link on which we got channel access
* \param linkId the ID of the link on which MPDUs contained in the returned queue must be
* allowed to be sent
* \param sortedQueuesIt iterator pointing to the queue we start the search from
* \return the ID of the selected container queue (if any)
*/
std::optional<WifiContainerQueueId> DoGetNext(AcIndex ac,
uint8_t linkId,
std::optional<uint8_t> linkId,
typename SortedQueues::iterator sortedQueuesIt);
/**
@@ -566,19 +570,19 @@ WifiMacQueueSchedulerImpl<Priority, Compare>::GetQueueLinkMask(AcIndex ac,
template <class Priority, class Compare>
std::optional<WifiContainerQueueId>
WifiMacQueueSchedulerImpl<Priority, Compare>::GetNext(AcIndex ac, uint8_t linkId)
WifiMacQueueSchedulerImpl<Priority, Compare>::GetNext(AcIndex ac, std::optional<uint8_t> linkId)
{
NS_LOG_FUNCTION(this << +ac << +linkId);
NS_LOG_FUNCTION(this << +ac << linkId.has_value());
return DoGetNext(ac, linkId, m_perAcInfo[ac].sortedQueues.begin());
}
template <class Priority, class Compare>
std::optional<WifiContainerQueueId>
WifiMacQueueSchedulerImpl<Priority, Compare>::GetNext(AcIndex ac,
uint8_t linkId,
std::optional<uint8_t> linkId,
const WifiContainerQueueId& prevQueueId)
{
NS_LOG_FUNCTION(this << +ac << +linkId);
NS_LOG_FUNCTION(this << +ac << linkId.has_value());
auto queueInfoIt = m_perAcInfo[ac].queueInfoMap.find(prevQueueId);
NS_ABORT_IF(queueInfoIt == m_perAcInfo[ac].queueInfoMap.end() ||
@@ -594,19 +598,20 @@ template <class Priority, class Compare>
std::optional<WifiContainerQueueId>
WifiMacQueueSchedulerImpl<Priority, Compare>::DoGetNext(
AcIndex ac,
uint8_t linkId,
std::optional<uint8_t> linkId,
typename SortedQueues::iterator sortedQueuesIt)
{
NS_LOG_FUNCTION(this << +ac << +linkId);
NS_LOG_FUNCTION(this << +ac << linkId.has_value());
NS_ASSERT(static_cast<uint8_t>(ac) < AC_UNDEF);
while (sortedQueuesIt != m_perAcInfo[ac].sortedQueues.end())
{
const auto& queueInfoPair = sortedQueuesIt->second.get();
const auto& linkIds = queueInfoPair.second.linkIds;
typename std::decay_t<decltype(linkIds)>::const_iterator linkIt;
if (const auto linkIt = linkIds.find(linkId);
linkIt != linkIds.cend() && linkIt->second.none())
if (!linkId.has_value() ||
((linkIt = linkIds.find(*linkId)) != linkIds.cend() && linkIt->second.none()))
{
// Packets in this queue can be sent over the link we got channel access on.
// Now remove packets with expired lifetime from this queue.

15
src/wifi/model/wifi-mac-queue-scheduler.h
View File

@@ -104,26 +104,29 @@ class WifiMacQueueScheduler : public Object
/**
* Get the next queue to serve, which is guaranteed to contain at least an MPDU
* whose lifetime has not expired. Queues containing MPDUs that cannot be sent
* over the given link are ignored.
* over the given link (if any) are ignored.
*
* \param ac the Access Category that we want to serve
* \param linkId the ID of the link on which we got channel access
* \param linkId the ID of the link on which MPDUs contained in the returned queue must be
* allowed to be sent
* \return the ID of the selected container queue (if any)
*/
virtual std::optional<WifiContainerQueueId> GetNext(AcIndex ac, uint8_t linkId) = 0;
virtual std::optional<WifiContainerQueueId> GetNext(AcIndex ac,
std::optional<uint8_t> linkId) = 0;
/**
* Get the next queue to serve after the given one. The returned queue is
* guaranteed to contain at least an MPDU whose lifetime has not expired.
* Queues containing MPDUs that cannot be sent over the given link are ignored.
* Queues containing MPDUs that cannot be sent over the given link (if any) are ignored.
*
* \param ac the Access Category that we want to serve
* \param linkId the ID of the link on which we got channel access
* \param linkId the ID of the link on which MPDUs contained in the returned queue must be
* allowed to be sent
* \param prevQueueId the ID of the container queue served previously
* \return the ID of the selected container queue (if any)
*/
virtual std::optional<WifiContainerQueueId> GetNext(
AcIndex ac,
uint8_t linkId,
std::optional<uint8_t> linkId,
const WifiContainerQueueId& prevQueueId) = 0;
/**