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

avoid decrementing by too many backoff slots

Browse Source
This commit is contained in:
Mathieu Lacage
2007-11-19 14:22:45 +01:00
parent 7ad2a4c3f2
commit b809739d8c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/wifi/dcf-manager.cc
View File

@@ -57,8 +57,7 @@ DcfState::UpdateFailedCw (void)
void
DcfState::UpdateBackoffSlotsNow (uint32_t nSlots, Time backoffUpdateBound)
{
uint32_t n = std::min (nSlots, m_backoffSlots);
m_backoffSlots -= n;
m_backoffSlots -= nSlots;
m_backoffStart = backoffUpdateBound;
MY_DEBUG ("update slots="<<nSlots<<" slots, backoff="<<m_backoffSlots);
}
@@ -229,7 +228,8 @@ DcfManager::DoGrantAccess (void)
if (otherState->NeedsAccess () &&
GetBackoffEndFor (otherState) <= Simulator::Now ())
{
MY_DEBUG ("dcf " << k << " needs access. backoff expired. internal collision.");
MY_DEBUG ("dcf " << k << " needs access. backoff expired. internal collision. slots=" <<
otherState->GetBackoffSlots ());
/**
* all other dcfs with a lower priority whose backoff
* has expired and which needed access to the medium
@@ -334,9 +334,10 @@ DcfManager::UpdateBackoff (void)
*/
if (nIntSlots >= state->GetAifsn ())
{
MY_DEBUG ("dcf " << k << " dec backoff slots=" << nIntSlots);
Time backoffUpdateBound = backoffStart + Scalar (nIntSlots) * m_slotTime;
state->UpdateBackoffSlotsNow (nIntSlots, backoffUpdateBound);
uint32_t n = std::min (nIntSlots, state->GetBackoffSlots ());
MY_DEBUG ("dcf " << k << " dec backoff slots=" << n);
Time backoffUpdateBound = backoffStart + Scalar (n) * m_slotTime;
state->UpdateBackoffSlotsNow (n, backoffUpdateBound);
}
}
}