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

wifi: Keep UL OFDMA enabled only during the frame exchange of interest in MLO test

Browse Source
This commit is contained in:
Stefano Avallone
2023-09-21 10:33:16 +02:00
committed by Stefano Avallone
parent af0df4884a
commit 1dde39c87c
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/wifi/test/wifi-mlo-test.cc
View File

@@ -2422,6 +2422,7 @@ class MultiLinkMuTxTest : public MultiLinkOperationsTestBase
std::vector<PacketSocketAddress> m_sockets; ///< packet socket addresses for STAs
std::size_t m_nPackets; ///< number of application packets to generate
std::size_t m_blockAckCount{0}; ///< transmitted BlockAck counter
std::size_t m_tfCount{0}; ///< transmitted Trigger Frame counter
// std::size_t m_blockAckReqCount{0}; ///< transmitted BlockAckReq counter
std::map<AddrSeqNoPair, std::size_t> m_inflightCount; ///< max number of simultaneous
///< transmissions of each data frame
@@ -2570,6 +2571,13 @@ MultiLinkMuTxTest::Transmit(Ptr<WifiMac> mac,
GetApplication(m_sockets[i], m_nPackets, 450, txDuration, i * 4));
}
}
if (++m_tfCount == m_staMacs[0]->GetSetupLinkIds().size())
{
// a TF has been sent on all the setup links, we can now disable UL OFDMA
auto muScheduler = m_apMac->GetObject<MultiUserScheduler>();
NS_TEST_ASSERT_MSG_NE(muScheduler, nullptr, "Expected an aggregated MU scheduler");
muScheduler->SetAttribute("EnableUlOfdma", BooleanValue(false));
}
break;
default:;
}
@@ -2778,13 +2786,12 @@ MultiLinkMuTxTest::DoSetup()
}
// aggregate MU scheduler
auto muScheduler = CreateObjectWithAttributes<RrMultiUserScheduler>(
"EnableUlOfdma",
BooleanValue(m_muTrafficPattern == WifiMuTrafficPattern::UL_MU),
"EnableBsrp",
BooleanValue(false),
"UlPsduSize",
UintegerValue(2000));
auto muScheduler = CreateObjectWithAttributes<RrMultiUserScheduler>("EnableUlOfdma",
BooleanValue(false),
"EnableBsrp",
BooleanValue(false),
"UlPsduSize",
UintegerValue(2000));
m_apMac->AggregateObject(muScheduler);
// install post reception error model on all devices
@@ -2861,6 +2868,7 @@ MultiLinkMuTxTest::StartTraffic()
Simulator::Schedule(m_nStations * MilliSeconds(50), [this]() {
auto muScheduler = m_apMac->GetObject<MultiUserScheduler>();
NS_TEST_ASSERT_MSG_NE(muScheduler, nullptr, "Expected an aggregated MU scheduler");
muScheduler->SetAttribute("EnableUlOfdma", BooleanValue(true));
muScheduler->SetAccessReqInterval(MilliSeconds(3));
// channel access is requested only once
muScheduler->SetAccessReqInterval(Seconds(0));