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

wifi: Rename functions in ChannelAccessManager to differentiate DCF and PCF

Browse Source
This commit is contained in:
Sébastien Deronne
2018-09-22 17:29:39 +02:00
parent 29dcbd175f
commit 6c960f9778
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wifi/model/channel-access-manager.cc
View File

@@ -290,7 +290,7 @@ ChannelAccessManager::RequestAccess (Ptr<Txop> state, bool isCfPeriod)
{
state->NotifyAccessRequested ();
Time delay = (MostRecent (GetAccessGrantStart (true), Simulator::Now ()) - Simulator::Now ());
m_accessTimeout = Simulator::Schedule (delay, &ChannelAccessManager::GrantPcfAccess, this, state);
m_accessTimeout = Simulator::Schedule (delay, &ChannelAccessManager::DoGrantPcfAccess, this, state);
return;
}
UpdateBackoff ();
@@ -328,18 +328,18 @@ ChannelAccessManager::RequestAccess (Ptr<Txop> state, bool isCfPeriod)
return;
}
}
DoGrantAccess ();
DoGrantDcfAccess ();
DoRestartAccessTimeoutIfNeeded ();
}
void
ChannelAccessManager::GrantPcfAccess (Ptr<Txop> state) //to be renamed
ChannelAccessManager::DoGrantPcfAccess (Ptr<Txop> state)
{
state->NotifyAccessGranted ();
}
void
ChannelAccessManager::DoGrantAccess (void)
ChannelAccessManager::DoGrantDcfAccess (void)
{
NS_LOG_FUNCTION (this);
uint32_t k = 0;
@@ -398,7 +398,7 @@ ChannelAccessManager::AccessTimeout (void)
{
NS_LOG_FUNCTION (this);
UpdateBackoff ();
DoGrantAccess ();
DoGrantDcfAccess ();
DoRestartAccessTimeoutIfNeeded ();
}
@@ -792,7 +792,7 @@ ChannelAccessManager::NotifyAckTimeoutStartNow (Time duration)
}
void
ChannelAccessManager::NotifyAckTimeoutResetNow ()
ChannelAccessManager::NotifyAckTimeoutResetNow (void)
{
NS_LOG_FUNCTION (this);
m_lastAckTimeoutEnd = Simulator::Now ();
@@ -807,7 +807,7 @@ ChannelAccessManager::NotifyCtsTimeoutStartNow (Time duration)
}
void
ChannelAccessManager::NotifyCtsTimeoutResetNow ()
ChannelAccessManager::NotifyCtsTimeoutResetNow (void)
{
NS_LOG_FUNCTION (this);
m_lastCtsTimeoutEnd = Simulator::Now ();

10
src/wifi/model/channel-access-manager.h
View File

@@ -97,7 +97,7 @@ public:
/**
* \return value set previously using SetEifsNoDifs.
*/
Time GetEifsNoDifs () const;
Time GetEifsNoDifs (void) const;
/**
* \param dcf a new Txop.
@@ -198,7 +198,7 @@ public:
/**
* Notify that ACK timer has reset.
*/
void NotifyAckTimeoutResetNow ();
void NotifyAckTimeoutResetNow (void);
/**
* Notify that CTS timer has started for the given duration.
*
@@ -208,7 +208,7 @@ public:
/**
* Notify that CTS timer has reset.
*/
void NotifyCtsTimeoutResetNow ();
void NotifyCtsTimeoutResetNow (void);
/**
* Check if the device is busy sending or receiving,
@@ -304,7 +304,7 @@ private:
/**
* Grant access to DCF
*/
void DoGrantAccess (void);
void DoGrantDcfAccess (void);
/**
* Check if the device is between frames (in DIFS or AIFS interval)
*
@@ -316,7 +316,7 @@ private:
/**
* Grant access to PCF
*/
void GrantPcfAccess (Ptr<Txop> state);
void DoGrantPcfAccess (Ptr<Txop> state);
/**
* typedef for a vector of Txops