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

wifi: Call expired traced callback when the current flow of operations complete

Browse Source 
...to avoid nested calls to ExtractExpiredMpdus while enqueuing/dequeuing frames.
This commit is contained in:
Stefano Avallone
2022-11-27 23:09:29 +01:00
committed by Stefano Avallone
parent a0105a6ab3
commit 79286b20e5
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wifi/model/wifi-mac-queue.cc
View File

@@ -111,11 +111,17 @@ WifiMacQueue::ExtractExpiredMpdus(const WifiContainerQueueId& queueId) const
for (auto it = first; it != last; it++)
{
mpdus.push_back(it->mpdu);
}
for (const auto& mpdu : mpdus)
{
// fire the Expired trace
m_traceExpired(it->mpdu);
Simulator::ScheduleNow(&WifiMacQueue::m_traceExpired, this, mpdu);
}
// notify the scheduler
m_scheduler->NotifyRemove(m_ac, mpdus);
if (!mpdus.empty())
{
m_scheduler->NotifyRemove(m_ac, mpdus);
}
}
void
@@ -129,11 +135,17 @@ WifiMacQueue::ExtractAllExpiredMpdus() const
for (auto it = first; it != last; it++)
{
mpdus.push_back(it->mpdu);
}
for (const auto& mpdu : mpdus)
{
// fire the Expired trace
m_traceExpired(it->mpdu);
Simulator::ScheduleNow(&WifiMacQueue::m_traceExpired, this, mpdu);
}
// notify the scheduler
m_scheduler->NotifyRemove(m_ac, mpdus);
if (!mpdus.empty())
{
m_scheduler->NotifyRemove(m_ac, mpdus);
}
}
void