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

wifi: Improve log messages in Channel Access Manager

Browse Source
This commit is contained in:
Stefano Avallone
2023-10-05 21:44:12 +02:00
committed by Stefano Avallone
parent cb7f3b68b6
commit 7dfb732a0d
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
#include "channel-access-manager.h"
#include "txop.h"
#include "wifi-mac-queue.h"
#include "wifi-phy-listener.h"
#include "wifi-phy.h"
@@ -634,11 +635,13 @@ ChannelAccessManager::GetAccessGrantStart(bool ignoreNav) const
ctsTimeoutAccessStart,
switchingAccessStart});
}
std::stringstream ss;
NS_LOG_INFO("access grant start=" << accessGrantedStart << ", rx access start=" << rxAccessStart
<< ", busy access start=" << busyAccessStart
<< ", tx access start=" << txAccessStart
<< ", nav access start=" << navAccessStart << ss.str());
NS_LOG_INFO("access grant start=" << accessGrantedStart.As(Time::US)
<< ", rx access start=" << rxAccessStart.As(Time::US)
<< ", busy access start=" << busyAccessStart.As(Time::US)
<< ", tx access start=" << txAccessStart.As(Time::US)
<< ", nav access start=" << navAccessStart.As(Time::US)
<< ", switching access start="
<< switchingAccessStart.As(Time::US));
return accessGrantedStart;
}
@@ -649,7 +652,8 @@ ChannelAccessManager::GetBackoffStartFor(Ptr<Txop> txop)
Time mostRecentEvent =
std::max({txop->GetBackoffStart(m_linkId),
GetAccessGrantStart() + (txop->GetAifsn(m_linkId) * GetSlot())});
NS_LOG_DEBUG("Backoff start: " << mostRecentEvent.As(Time::US));
NS_LOG_DEBUG("Backoff start for " << txop->GetWifiMacQueue()->GetAc() << ": "
<< mostRecentEvent.As(Time::US));
return mostRecentEvent;
}
@@ -659,7 +663,8 @@ ChannelAccessManager::GetBackoffEndFor(Ptr<Txop> txop)
{
NS_LOG_FUNCTION(this << txop);
Time backoffEnd = GetBackoffStartFor(txop) + (txop->GetBackoffSlots(m_linkId) * GetSlot());
NS_LOG_DEBUG("Backoff end: " << backoffEnd.As(Time::US));
NS_LOG_DEBUG("Backoff end for " << txop->GetWifiMacQueue()->GetAc() << ": "
<< backoffEnd.As(Time::US));
return backoffEnd;
}