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

wifi: Fix valgrind issue in ChannelAccessManager test

Browse Source
This commit is contained in:
Tom Henderson
2022-06-18 08:21:00 -07:00
parent ab0bef5e24
commit dff0b609f6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wifi/test/channel-access-manager-test.cc
View File

@@ -1265,8 +1265,7 @@ private:
};
LargestIdlePrimaryChannelTest::LargestIdlePrimaryChannelTest ()
: TestCase ("Check calculation of the largest idle primary channel"),
m_cam (CreateObject<ChannelAccessManager> ())
: TestCase ("Check calculation of the largest idle primary channel")
{
}
@@ -1401,6 +1400,7 @@ LargestIdlePrimaryChannelTest::RunOne (uint16_t chWidth, WifiChannelListType bus
void
LargestIdlePrimaryChannelTest::DoRun ()
{
m_cam = CreateObject<ChannelAccessManager> ();
uint16_t delay = 0;
uint8_t channel = 0;
std::list<WifiChannelListType> busyChannels;
@@ -1415,7 +1415,11 @@ LargestIdlePrimaryChannelTest::DoRun ()
[this, chWidth, busyChannel]()
{
// reset PHY
m_cam->RemovePhyListener (m_phy);
if (m_phy)
{
m_cam->RemovePhyListener (m_phy);
m_phy->Dispose ();
}
// create a new PHY operating on a channel of the current width
m_phy = CreateObject<SpectrumWifiPhy> ();
m_phy->SetOperatingChannel (WifiPhy::ChannelTuple {0, chWidth,
@@ -1433,6 +1437,9 @@ LargestIdlePrimaryChannelTest::DoRun ()
}
Simulator::Run ();
m_cam->RemovePhyListener (m_phy);
m_phy->Dispose ();
m_cam->Dispose ();
Simulator::Destroy ();
}