From f573706a7455d4153d4e6221efed60a0985f3c35 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Mon, 27 May 2024 18:32:16 +0200 Subject: [PATCH] wifi: Make WifiHelper::AssignStreams() static Suggested by Sharan Naribole --- examples/wireless/wifi-eht-network.cc | 4 +-- examples/wireless/wifi-he-network.cc | 4 +-- examples/wireless/wifi-ht-network.cc | 4 +-- .../wifi-simple-ht-hidden-stations.cc | 4 +-- examples/wireless/wifi-vht-network.cc | 4 +-- src/aodv/test/aodv-regression.cc | 2 +- src/aodv/test/bug-772.cc | 2 +- src/test/ns3wifi/wifi-issue-211-test-suite.cc | 2 +- src/wifi/examples/wifi-bianchi.cc | 2 +- src/wifi/examples/wifi-manager-example.cc | 4 +-- src/wifi/helper/wifi-helper.h | 2 +- src/wifi/test/inter-bss-test-suite.cc | 4 +-- src/wifi/test/wifi-channel-switching-test.cc | 2 +- src/wifi/test/wifi-dynamic-bw-op-test.cc | 4 +-- src/wifi/test/wifi-emlsr-test.cc | 4 +-- src/wifi/test/wifi-fils-frame-test.cc | 2 +- src/wifi/test/wifi-mac-ofdma-test.cc | 4 +-- src/wifi/test/wifi-mlo-test.cc | 4 +-- src/wifi/test/wifi-phy-ofdma-test.cc | 2 +- src/wifi/test/wifi-phy-reception-test.cc | 2 +- src/wifi/test/wifi-primary-channels-test.cc | 4 +-- src/wifi/test/wifi-test.cc | 28 +++++++++---------- src/wifi/test/wifi-txop-test.cc | 2 +- 23 files changed, 48 insertions(+), 48 deletions(-) diff --git a/examples/wireless/wifi-eht-network.cc b/examples/wireless/wifi-eht-network.cc index d14fa202a..28307fd3a 100644 --- a/examples/wireless/wifi-eht-network.cc +++ b/examples/wireless/wifi-eht-network.cc @@ -442,8 +442,8 @@ main(int argc, char* argv[]) apDevice = wifi.Install(phy, mac, wifiApNode); int64_t streamNumber = 100; - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevices, streamNumber); // Set guard interval and MPDU buffer size Config::Set( diff --git a/examples/wireless/wifi-he-network.cc b/examples/wireless/wifi-he-network.cc index 17b88cc5c..bfe1ab673 100644 --- a/examples/wireless/wifi-he-network.cc +++ b/examples/wireless/wifi-he-network.cc @@ -323,8 +323,8 @@ main(int argc, char* argv[]) } int64_t streamNumber = 150; - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevices, streamNumber); // mobility. MobilityHelper mobility; diff --git a/examples/wireless/wifi-ht-network.cc b/examples/wireless/wifi-ht-network.cc index 5b2f545e2..153bafbca 100644 --- a/examples/wireless/wifi-ht-network.cc +++ b/examples/wireless/wifi-ht-network.cc @@ -197,8 +197,8 @@ main(int argc, char* argv[]) apDevice = wifi.Install(phy, mac, wifiApNode); int64_t streamNumber = 150; - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevice, streamNumber); // mobility. MobilityHelper mobility; diff --git a/examples/wireless/wifi-simple-ht-hidden-stations.cc b/examples/wireless/wifi-simple-ht-hidden-stations.cc index fd779b3be..79af4d33f 100644 --- a/examples/wireless/wifi-simple-ht-hidden-stations.cc +++ b/examples/wireless/wifi-simple-ht-hidden-stations.cc @@ -139,8 +139,8 @@ main(int argc, char* argv[]) UintegerValue(maxAmpduSize)); int64_t streamNumber = 20; - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevices, streamNumber); // Setting mobility model MobilityHelper mobility; diff --git a/examples/wireless/wifi-vht-network.cc b/examples/wireless/wifi-vht-network.cc index df9b85473..2c6a642d0 100644 --- a/examples/wireless/wifi-vht-network.cc +++ b/examples/wireless/wifi-vht-network.cc @@ -179,8 +179,8 @@ main(int argc, char* argv[]) apDevice = wifi.Install(phy, mac, wifiApNode); int64_t streamNumber = 150; - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevice, streamNumber); // mobility. MobilityHelper mobility; diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index d79384a80..f685b0fd7 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -193,7 +193,7 @@ ChainRegressionTest::CreateDevices() NetDeviceContainer devices = wifi.Install(wifiPhy, wifiMac, *m_nodes); // Assign fixed stream numbers to wifi and channel random variables - streamsUsed += wifi.AssignStreams(devices, streamsUsed); + streamsUsed += WifiHelper::AssignStreams(devices, streamsUsed); // Assign 6 streams per device NS_TEST_ASSERT_MSG_EQ(streamsUsed, (devices.GetN() * 2), "Stream assignment mismatch"); streamsUsed += wifiChannel.AssignStreams(chan, streamsUsed); diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc index cd41059d9..799fc9fb3 100644 --- a/src/aodv/test/bug-772.cc +++ b/src/aodv/test/bug-772.cc @@ -163,7 +163,7 @@ Bug772ChainTest::CreateDevices() NetDeviceContainer devices = wifi.Install(wifiPhy, wifiMac, *m_nodes); // Assign fixed stream numbers to wifi and channel random variables - streamsUsed += wifi.AssignStreams(devices, streamsUsed); + streamsUsed += WifiHelper::AssignStreams(devices, streamsUsed); // Assign 6 streams per device NS_TEST_ASSERT_MSG_EQ(streamsUsed, (devices.GetN() * 2), "Stream assignment mismatch"); streamsUsed += wifiChannel.AssignStreams(chan, streamsUsed); diff --git a/src/test/ns3wifi/wifi-issue-211-test-suite.cc b/src/test/ns3wifi/wifi-issue-211-test-suite.cc index 0484ff48a..3125afa3e 100644 --- a/src/test/ns3wifi/wifi-issue-211-test-suite.cc +++ b/src/test/ns3wifi/wifi-issue-211-test-suite.cc @@ -153,7 +153,7 @@ Issue211Test::DoRun() NetDeviceContainer apDevices = wifi.Install(phy, mac, wifiApNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevices, streamNumber); + WifiHelper::AssignStreams(apDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/examples/wifi-bianchi.cc b/src/wifi/examples/wifi-bianchi.cc index d49efe76a..cc40bad4b 100644 --- a/src/wifi/examples/wifi-bianchi.cc +++ b/src/wifi/examples/wifi-bianchi.cc @@ -2509,7 +2509,7 @@ Experiment::Run(const WifiHelper& helper, devices = wifi.Install(phy, mac, wifiNodes); } - wifi.AssignStreams(devices, trialNumber); + WifiHelper::AssignStreams(devices, trialNumber); Config::Set( "/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/HtConfiguration/ShortGuardIntervalSupported", diff --git a/src/wifi/examples/wifi-manager-example.cc b/src/wifi/examples/wifi-manager-example.cc index ff8cd30a2..d005c0be8 100644 --- a/src/wifi/examples/wifi-manager-example.cc +++ b/src/wifi/examples/wifi-manager-example.cc @@ -677,8 +677,8 @@ main(int argc, char* argv[]) clientDevice = wifi.Install(wifiPhy, wifiMac, clientNode); } - wifi.AssignStreams(serverDevice, 100); - wifi.AssignStreams(clientDevice, 200); + WifiHelper::AssignStreams(serverDevice, 100); + WifiHelper::AssignStreams(clientDevice, 200); Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/BE_MaxAmpduSize", UintegerValue(maxAmpduSize)); diff --git a/src/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h index aad6b1089..1ca697d67 100644 --- a/src/wifi/helper/wifi-helper.h +++ b/src/wifi/helper/wifi-helper.h @@ -515,7 +515,7 @@ class WifiHelper * \param stream first stream index to use * \return the number of stream indices assigned by this helper */ - int64_t AssignStreams(NetDeviceContainer c, int64_t stream); + static int64_t AssignStreams(NetDeviceContainer c, int64_t stream); protected: mutable std::vector m_stationManager; ///< station manager diff --git a/src/wifi/test/inter-bss-test-suite.cc b/src/wifi/test/inter-bss-test-suite.cc index fd5d8edff..b6db6b7c9 100644 --- a/src/wifi/test/inter-bss-test-suite.cc +++ b/src/wifi/test/inter-bss-test-suite.cc @@ -875,13 +875,13 @@ TestInterBssConstantObssPdAlgo::RunOne() m_staDevices = wifi.Install(phy, mac, wifiStaNodes); // Assign fixed streams to random variables in use - wifi.AssignStreams(m_staDevices, streamNumber); + WifiHelper::AssignStreams(m_staDevices, streamNumber); mac.SetType("ns3::ApWifiMac", "Ssid", SsidValue(ssid)); m_apDevices = wifi.Install(phy, mac, wifiApNodes); // Assign fixed streams to random variables in use - wifi.AssignStreams(m_apDevices, streamNumber); + WifiHelper::AssignStreams(m_apDevices, streamNumber); for (uint32_t i = 0; i < m_apDevices.GetN(); i++) { diff --git a/src/wifi/test/wifi-channel-switching-test.cc b/src/wifi/test/wifi-channel-switching-test.cc index 5c40b20ce..c9ca37078 100644 --- a/src/wifi/test/wifi-channel-switching-test.cc +++ b/src/wifi/test/wifi-channel-switching-test.cc @@ -257,7 +257,7 @@ WifiChannelSwitchingTest::DoRun() m_apDevice = wifi.Install(phy, mac, m_apNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(m_apDevice, streamNumber); + WifiHelper::AssignStreams(m_apDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-dynamic-bw-op-test.cc b/src/wifi/test/wifi-dynamic-bw-op-test.cc index 71942624f..fd35e2863 100644 --- a/src/wifi/test/wifi-dynamic-bw-op-test.cc +++ b/src/wifi/test/wifi-dynamic-bw-op-test.cc @@ -232,8 +232,8 @@ WifiUseAvailBwTest::DoRun() Ptr dev; // Assign fixed streams to random variables in use - streamNumber += wifi.AssignStreams(m_apDevices, streamNumber); - streamNumber += wifi.AssignStreams(m_staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(m_apDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(m_staDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-emlsr-test.cc b/src/wifi/test/wifi-emlsr-test.cc index 5976047af..e7eb4cd95 100644 --- a/src/wifi/test/wifi-emlsr-test.cc +++ b/src/wifi/test/wifi-emlsr-test.cc @@ -262,8 +262,8 @@ EmlsrOperationsTestBase::DoSetup() // phyHelper.EnablePcap("wifi-emlsr_STA", staDevices); // Assign fixed streams to random variables in use - streamNumber += wifi.AssignStreams(apDevice, streamNumber); - streamNumber += wifi.AssignStreams(staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevice, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-fils-frame-test.cc b/src/wifi/test/wifi-fils-frame-test.cc index 45ecf478a..369086998 100644 --- a/src/wifi/test/wifi-fils-frame-test.cc +++ b/src/wifi/test/wifi-fils-frame-test.cc @@ -220,7 +220,7 @@ WifiFilsFrameTest::SetupDevice(Ptr& channel, bool isAp) BooleanValue(false)); } auto testDevs = wifi.Install(phy, mac, node); - wifi.AssignStreams(testDevs, DEFAULT_STREAM_INDEX); + WifiHelper::AssignStreams(testDevs, DEFAULT_STREAM_INDEX); auto dev = DynamicCast(testDevs.Get(0)); mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); mobility.Install(node); diff --git a/src/wifi/test/wifi-mac-ofdma-test.cc b/src/wifi/test/wifi-mac-ofdma-test.cc index a038096bb..17e9cc8d3 100644 --- a/src/wifi/test/wifi-mac-ofdma-test.cc +++ b/src/wifi/test/wifi-mac-ofdma-test.cc @@ -2145,8 +2145,8 @@ OfdmaAckSequenceTest::DoRun() m_apDevice = DynamicCast(wifi.Install(phy, mac, wifiApNode).Get(0)); // Assign fixed streams to random variables in use - streamNumber += wifi.AssignStreams(NetDeviceContainer(m_apDevice), streamNumber); - streamNumber += wifi.AssignStreams(m_staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(NetDeviceContainer(m_apDevice), streamNumber); + streamNumber += WifiHelper::AssignStreams(m_staDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-mlo-test.cc b/src/wifi/test/wifi-mlo-test.cc index f021d9e3e..86d9dd9ad 100644 --- a/src/wifi/test/wifi-mlo-test.cc +++ b/src/wifi/test/wifi-mlo-test.cc @@ -761,8 +761,8 @@ MultiLinkOperationsTestBase::DoSetup() // staPhyHelper.EnablePcap("wifi-mlo_STA", staDevices); // Assign fixed streams to random variables in use - streamNumber += wifi.AssignStreams(apDevices, streamNumber); - streamNumber += wifi.AssignStreams(staDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(apDevices, streamNumber); + streamNumber += WifiHelper::AssignStreams(staDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index d402d9c8f..999b538e1 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -5631,7 +5631,7 @@ TestUlOfdmaPowerControl::DoSetup() WifiMacHelper mac; mac.SetType("ns3::StaWifiMac"); NetDeviceContainer staDevs = wifi.Install(spectrumPhy, mac, staNodes); - wifi.AssignStreams(staDevs, 0); + WifiHelper::AssignStreams(staDevs, 0); m_sta1Dev = DynamicCast(staDevs.Get(0)); NS_ASSERT(m_sta1Dev); m_sta2Dev = DynamicCast(staDevs.Get(1)); diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc index aac26826b..e9db8a9ef 100644 --- a/src/wifi/test/wifi-phy-reception-test.cc +++ b/src/wifi/test/wifi-phy-reception-test.cc @@ -4129,7 +4129,7 @@ TestUnsupportedModulationReception::DoRun() } // Assign fixed streams to random variables in use - wifi.AssignStreams(m_apDevices, streamNumber); + WifiHelper::AssignStreams(m_apDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-primary-channels-test.cc b/src/wifi/test/wifi-primary-channels-test.cc index 1c07bff04..6c3d97aa2 100644 --- a/src/wifi/test/wifi-primary-channels-test.cc +++ b/src/wifi/test/wifi-primary-channels-test.cc @@ -427,10 +427,10 @@ WifiPrimaryChannelsTest::DoSetup() } // Assign fixed streams to random variables in use - streamNumber = wifi.AssignStreams(m_apDevices, streamNumber); + streamNumber = WifiHelper::AssignStreams(m_apDevices, streamNumber); for (uint8_t bss = 0; bss < m_nBss; bss++) { - streamNumber = wifi.AssignStreams(m_staDevices[bss], streamNumber); + streamNumber = WifiHelper::AssignStreams(m_staDevices[bss], streamNumber); } // set BSS color diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc index 600d1f6cf..e41dd8ba8 100644 --- a/src/wifi/test/wifi-test.cc +++ b/src/wifi/test/wifi-test.cc @@ -1449,7 +1449,7 @@ Bug2222TestCase::DoRun() wifiDevices = wifi.Install(phy, mac, wifiNodes); // Assign fixed streams to random variables in use - wifi.AssignStreams(wifiDevices, streamNumber); + WifiHelper::AssignStreams(wifiDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -2065,9 +2065,9 @@ StaWifiMacScanningTestCase::Setup(bool nearestApBeaconGeneration, bool staActive staDevice = wifi.Install(phy, mac, staNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(apDeviceNearest, streamNumber + 1); - wifi.AssignStreams(staDevice, streamNumber + 2); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(apDeviceNearest, streamNumber + 1); + WifiHelper::AssignStreams(staDevice, streamNumber + 2); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -2402,8 +2402,8 @@ Bug2470TestCase::RunSubtest(TypeOfStation rcvErrorType) staDevice = wifi.Install(phy, mac, wifiStaNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(staDevice, streamNumber); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(staDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -2683,8 +2683,8 @@ Issue40TestCase::RunOne(bool useAmpdu) staDevice = wifi.Install(phy, mac, wifiStaNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(staDevice, streamNumber); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(staDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -2908,8 +2908,8 @@ Issue169TestCase::DoRun() staDevice = wifi.Install(phy, mac, wifiStaNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(staDevice, streamNumber); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(staDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -3079,8 +3079,8 @@ IdealRateManagerChannelWidthTest::DoRun() staDevice = wifi.Install(phy, mac, wifiStaNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(staDevice, streamNumber); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(staDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); @@ -3310,8 +3310,8 @@ IdealRateManagerMimoTest::DoRun() staDevice = wifi.Install(phy, mac, wifiStaNode); // Assign fixed streams to random variables in use - wifi.AssignStreams(apDevice, streamNumber); - wifi.AssignStreams(staDevice, streamNumber); + WifiHelper::AssignStreams(apDevice, streamNumber); + WifiHelper::AssignStreams(staDevice, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject(); diff --git a/src/wifi/test/wifi-txop-test.cc b/src/wifi/test/wifi-txop-test.cc index 5569e8e2d..5e73c0c00 100644 --- a/src/wifi/test/wifi-txop-test.cc +++ b/src/wifi/test/wifi-txop-test.cc @@ -331,7 +331,7 @@ WifiTxopTest::DoRun() } // Assign fixed streams to random variables in use - wifi.AssignStreams(m_apDevices, streamNumber); + WifiHelper::AssignStreams(m_apDevices, streamNumber); MobilityHelper mobility; Ptr positionAlloc = CreateObject();