Skip to content

Commit 4debc89

Browse files
ShefaliGups11Viyom
authored andcommitted
Remove deprecated QueueDisc attribute dependency
1 parent 062cdd5 commit 4debc89

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/aqm-eval-suite/helper/aqm-eval-suite-helper.cc

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,36 +58,32 @@ ScenarioImpl::DestroyTrace (EvaluationTopology et)
5858
void
5959
ScenarioImpl::ConfigureQueueDisc (uint32_t limit, uint32_t pktsize, std::string linkbw, std::string linkdel, std::string mode)
6060
{
61-
Config::SetDefault ("ns3::PfifoFastQueueDisc::Limit", UintegerValue (limit));
61+
Config::SetDefault ("ns3::PfifoFastQueueDisc::MaxSize", StringValue (std::to_string (limit) + "p"));
6262

63-
Config::SetDefault ("ns3::RedQueueDisc::Mode", StringValue (mode));
6463
Config::SetDefault ("ns3::RedQueueDisc::MeanPktSize", UintegerValue (pktsize));
6564
Config::SetDefault ("ns3::RedQueueDisc::LinkBandwidth", StringValue (linkbw));
6665
Config::SetDefault ("ns3::RedQueueDisc::LinkDelay", StringValue (linkdel));
6766

68-
Config::SetDefault ("ns3::CoDelQueueDisc::Mode", StringValue (mode));
69-
Config::SetDefault ("ns3::CoDelQueueDisc::MaxPackets", UintegerValue (limit));
70-
Config::SetDefault ("ns3::CoDelQueueDisc::MaxBytes", UintegerValue (limit * pktsize));
67+
Config::SetDefault ("ns3::CoDelQueueDisc::MaxSize", StringValue (std::to_string (limit) + "p"));
7168
Config::SetDefault ("ns3::CoDelQueueDisc::MinBytes", UintegerValue (pktsize));
7269

73-
Config::SetDefault ("ns3::PieQueueDisc::Mode", StringValue (mode));
7470
Config::SetDefault ("ns3::PieQueueDisc::MeanPktSize", UintegerValue (pktsize));
7571

7672
if (mode == "QUEUE_DISC_MODE_PACKETS")
7773
{
78-
Config::SetDefault ("ns3::RedQueueDisc::QueueLimit", UintegerValue (limit));
74+
Config::SetDefault ("ns3::RedQueueDisc::MaxSize", StringValue (std::to_string (limit) + "p"));
7975
Config::SetDefault ("ns3::RedQueueDisc::MinTh", DoubleValue (5));
8076
Config::SetDefault ("ns3::RedQueueDisc::MaxTh", DoubleValue (15));
8177

82-
Config::SetDefault ("ns3::PieQueueDisc::QueueLimit", UintegerValue (limit));
78+
Config::SetDefault ("ns3::PieQueueDisc::MaxSize", StringValue (std::to_string (limit) + "p"));
8379
}
8480
else
8581
{
86-
Config::SetDefault ("ns3::RedQueueDisc::QueueLimit", UintegerValue (limit * pktsize));
82+
Config::SetDefault ("ns3::RedQueueDisc::MaxSize",StringValue (std::to_string (limit * pktsize) + "B"));
8783
Config::SetDefault ("ns3::RedQueueDisc::MinTh", DoubleValue (5 * pktsize));
8884
Config::SetDefault ("ns3::RedQueueDisc::MaxTh", DoubleValue (15 * pktsize));
8985

90-
Config::SetDefault ("ns3::PieQueueDisc::QueueLimit", UintegerValue (limit * pktsize));
86+
Config::SetDefault ("ns3::PieQueueDisc::MaxSize", StringValue (std::to_string (limit * pktsize) + "B"));
9187
}
9288
}
9389

0 commit comments

Comments
 (0)