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

wifi: Cleanup duplicated code in WifiPhyStateHelper

Browse Source
This commit is contained in:
Sebastien Deronne
2022-04-23 11:45:00 +02:00
committed by Stefano Avallone
parent cc25eeea92
commit e943fe4beb
2 changed files with 32 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/wifi/model/wifi-phy-state-helper.cc
View File

@@ -330,27 +330,32 @@ WifiPhyStateHelper::LogPreviousIdleAndCcaBusyStates (void)
{
NS_LOG_FUNCTION (this);
Time now = Simulator::Now ();
Time idleStart = Max (m_endCcaBusy, m_endRx);
idleStart = Max (idleStart, m_endTx);
idleStart = Max (idleStart, m_endSwitching);
NS_ASSERT (idleStart <= now);
if (m_endCcaBusy > m_endRx
&& m_endCcaBusy > m_endSwitching
&& m_endCcaBusy > m_endTx)
WifiPhyState state = GetState ();
if (state == WifiPhyState::CCA_BUSY)
{
Time ccaBusyStart = Max (m_endTx, m_endRx);
ccaBusyStart = Max (ccaBusyStart, m_startCcaBusy);
ccaBusyStart = Max (ccaBusyStart, m_endSwitching);
Time ccaBusyDuration = idleStart - ccaBusyStart;
if (ccaBusyDuration.IsStrictlyPositive ())
{
m_stateLogger (ccaBusyStart, ccaBusyDuration, WifiPhyState::CCA_BUSY);
}
Time ccaStart = std::max ({m_endRx, m_endTx, m_startCcaBusy, m_endSwitching});
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
}
Time idleDuration = now - idleStart;
if (idleDuration.IsStrictlyPositive ())
else if (state == WifiPhyState::IDLE)
{
m_stateLogger (idleStart, idleDuration, WifiPhyState::IDLE);
Time idleStart = std::max ({m_endCcaBusy, m_endRx, m_endTx, m_endSwitching});
NS_ASSERT (idleStart <= now);
if (m_endCcaBusy > m_endRx
&& m_endCcaBusy > m_endSwitching
&& m_endCcaBusy > m_endTx)
{
Time ccaBusyStart = std::max ({m_endTx, m_endRx, m_startCcaBusy, m_endSwitching});
Time ccaBusyDuration = idleStart - ccaBusyStart;
if (ccaBusyDuration.IsStrictlyPositive ())
{
m_stateLogger (ccaBusyStart, ccaBusyDuration, WifiPhyState::CCA_BUSY);
}
}
Time idleDuration = now - idleStart;
if (idleDuration.IsStrictlyPositive ())
{
m_stateLogger (idleStart, idleDuration, WifiPhyState::IDLE);
}
}
}
@@ -377,12 +382,7 @@ WifiPhyStateHelper::SwitchToTx (Time txDuration, WifiConstPsduMap psdus, double
m_endRx = now;
break;
case WifiPhyState::CCA_BUSY:
{
Time ccaStart = Max (m_endRx, m_endTx);
ccaStart = Max (ccaStart, m_startCcaBusy);
ccaStart = Max (ccaStart, m_endSwitching);
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
} break;
[[fallthrough]];
case WifiPhyState::IDLE:
LogPreviousIdleAndCcaBusyStates ();
break;
@@ -406,15 +406,10 @@ WifiPhyStateHelper::SwitchToRx (Time rxDuration)
switch (GetState ())
{
case WifiPhyState::IDLE:
[[fallthrough]];
case WifiPhyState::CCA_BUSY:
LogPreviousIdleAndCcaBusyStates ();
break;
case WifiPhyState::CCA_BUSY:
{
Time ccaStart = Max (m_endRx, m_endTx);
ccaStart = Max (ccaStart, m_startCcaBusy);
ccaStart = Max (ccaStart, m_endSwitching);
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
} break;
default:
NS_FATAL_ERROR ("Invalid WifiPhy state " << GetState ());
break;
@@ -441,12 +436,7 @@ WifiPhyStateHelper::SwitchToChannelSwitching (Time switchingDuration)
m_endRx = now;
break;
case WifiPhyState::CCA_BUSY:
{
Time ccaStart = Max (m_endRx, m_endTx);
ccaStart = Max (ccaStart, m_startCcaBusy);
ccaStart = Max (ccaStart, m_endSwitching);
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
} break;
[[fallthrough]];
case WifiPhyState::IDLE:
LogPreviousIdleAndCcaBusyStates ();
break;
@@ -563,15 +553,10 @@ WifiPhyStateHelper::SwitchToSleep (void)
switch (GetState ())
{
case WifiPhyState::IDLE:
[[fallthrough]];
case WifiPhyState::CCA_BUSY:
LogPreviousIdleAndCcaBusyStates ();
break;
case WifiPhyState::CCA_BUSY:
{
Time ccaStart = Max (m_endRx, m_endTx);
ccaStart = Max (ccaStart, m_startCcaBusy);
ccaStart = Max (ccaStart, m_endSwitching);
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
} break;
default:
NS_FATAL_ERROR ("Invalid WifiPhy state.");
break;
@@ -635,15 +620,10 @@ WifiPhyStateHelper::SwitchToOff (void)
m_endTx = now;
break;
case WifiPhyState::IDLE:
[[fallthrough]];
case WifiPhyState::CCA_BUSY:
LogPreviousIdleAndCcaBusyStates ();
break;
case WifiPhyState::CCA_BUSY:
{
Time ccaStart = Max (m_endRx, m_endTx);
ccaStart = Max (ccaStart, m_startCcaBusy);
ccaStart = Max (ccaStart, m_endSwitching);
m_stateLogger (ccaStart, now - ccaStart, WifiPhyState::CCA_BUSY);
} break;
default:
NS_FATAL_ERROR ("Invalid WifiPhy state.");
break;

2
src/wifi/model/wifi-phy-state-helper.h
View File

@@ -293,7 +293,7 @@ private:
typedef std::vector<WifiPhyListener *>::iterator ListenersI;
/**
* Log the ideal and CCA states.
* Log the idle and CCA busy states.
*/
void LogPreviousIdleAndCcaBusyStates (void);