Skip to content

Aligning ns-3's implementation of RED with that of Linux #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
piyushnh wants to merge 6 commits into from
Closed

Aligning ns-3's implementation of RED with that of Linux #41

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0626f46
Removed m_cautious from doenqueue()
piyushnh Jun 6, 2019
f613cf3
Removed all usages of m_cautious
piyushnh Jun 6, 2019
939fa88
made m_ptc more readable
piyushnh Jun 6, 2019
dd3313e
removed diff values of wq,they are absent in linux version
piyushnh Jun 6, 2019
f61bcdb
removed unnecessary checking of m_iswait
piyushnh Jun 6, 2019
17511c1
fixed dequeue logic of idle time handling
piyushnh Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed unnecessary checking of m_iswait
  • Loading branch information
@piyushnh
piyushnh committed Jun 6, 2019
commit f61bcdbff74b13be43ddbd7f8ca7deb39a29bf96
44 changes: 16 additions & 28 deletions src/traffic-control/model/red-queue-disc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,39 +682,27 @@ double
RedQueueDisc::ModifyP (double p, uint32_t size)
{
NS_LOG_FUNCTION (this << p << size);
double count1 = (double) m_count;
double count = (double) m_count;

if (GetMaxSize ().GetUnit () == QueueSizeUnit::BYTES)
{
count1 = (double) (m_countBytes / m_meanPktSize);
count = (double) (m_countBytes / m_meanPktSize);
}

if (m_isWait)
{
if (count1 * p < 1.0)
{
p = 0.0;
}
else if (count1 * p < 2.0)
{
p /= (2.0 - count1 * p);
}
else
{
p = 1.0;
}
}
else
{
if (count1 * p < 1.0)
{
p /= (1.0 - count1 * p);
}
else
{
p = 1.0;
}
}

if (count * p < 1.0)
{
p = 0.0;
}
else if (count * p < 2.0)
{
p /= (2.0 - count * p);
}
else
{
p = 1.0;
}


if ((GetMaxSize ().GetUnit () == QueueSizeUnit::BYTES) && (p < 1.0))
{
Expand Down