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

wifi: Make Txop::StartAccessIfNeeded() public

Browse Source
This commit is contained in:
Stefano Avallone
2023-07-19 17:42:25 +02:00
parent 18d5b58e88
commit e98eb2f78b
3 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wifi/model/eht/eht-frame-exchange-manager.cc
View File

@@ -179,13 +179,11 @@ EhtFrameExchangeManager::StartTransmission(Ptr<Txop> edca, uint16_t allowedWidth
edca->NotifyChannelReleased(m_linkId);
NS_LOG_DEBUG("No new TXOP attempts allowed while MediumSyncDelay is running");
// request channel access if needed when the MediumSyncDelay timer expires
Simulator::Schedule(emlsrManager->GetMediumSyncDuration() - *elapsed, [=, this]() {
if (edca->GetAccessStatus(m_linkId) == Txop::NOT_REQUESTED &&
edca->HasFramesToTransmit(m_linkId))
{
m_staMac->GetChannelAccessManager(m_linkId)->RequestAccess(edca);
}
});
Simulator::Schedule(emlsrManager->GetMediumSyncDuration() - *elapsed,
&Txop::StartAccessIfNeeded,
edca,
m_linkId);
return false;
}

13
src/wifi/model/txop.h
View File

@@ -395,6 +395,13 @@ class Txop : public Object
*/
virtual ChannelAccessStatus GetAccessStatus(uint8_t linkId) const;
/**
* Request access from Txop on the given link if needed.
*
* \param linkId the ID of the given link
*/
void StartAccessIfNeeded(uint8_t linkId);
/**
* \param nSlots the number of slots of the backoff.
* \param linkId the ID of the given link
@@ -443,12 +450,6 @@ class Txop : public Object
* \param linkId the ID of the given link
*/
virtual void GenerateBackoff(uint8_t linkId);
/**
* Request access from Txop on the given link if needed.
*
* \param linkId the ID of the given link
*/
virtual void StartAccessIfNeeded(uint8_t linkId);
/**
* Request access to the ChannelAccessManager associated with the given link
*

9
src/wifi/model/wifi-mac.cc
View File

@@ -1465,14 +1465,7 @@ WifiMac::UnblockUnicastTxOnLinks(WifiQueueBlockedReason reason,
{linkId});
// request channel access if needed (schedule now because multiple invocations
// of this method may be done in a loop at the caller)
auto qosTxop = GetQosTxop(acIndex);
Simulator::ScheduleNow([=, this]() {
if (qosTxop->GetAccessStatus(linkId) == Txop::NOT_REQUESTED &&
qosTxop->HasFramesToTransmit(linkId))
{
GetLink(linkId).channelAccessManager->RequestAccess(qosTxop);
}
});
Simulator::ScheduleNow(&Txop::StartAccessIfNeeded, GetQosTxop(acIndex), linkId);
}
}
}