From e9d407154c35494f1d02acd8e2ac759e007be1c8 Mon Sep 17 00:00:00 2001 From: "Mohit P. Tahiliani" Date: Sun, 12 Apr 2020 13:14:22 +0530 Subject: [PATCH] traffic-control: Remove unused variable in COBALT --- src/traffic-control/doc/cobalt.rst | 2 -- src/traffic-control/model/cobalt-queue-disc.cc | 5 ----- src/traffic-control/model/cobalt-queue-disc.h | 2 -- src/traffic-control/test/cobalt-queue-disc-test-suite.cc | 2 -- 4 files changed, 11 deletions(-) diff --git a/src/traffic-control/doc/cobalt.rst b/src/traffic-control/doc/cobalt.rst index 10e968ab3..ba2dfa81b 100644 --- a/src/traffic-control/doc/cobalt.rst +++ b/src/traffic-control/doc/cobalt.rst @@ -86,8 +86,6 @@ Attributes The key attributes that the CobaltQueue Disc class holds include the following: * ``MaxSize:`` The maximum number of packets/bytes accepted by this queue disc. -* ``MinBytes:`` The Cobalt algorithm minbytes parameter. The default value is -1500 bytes. * ``Interval:`` The sliding-minimum window. The default value is 100 ms. * ``Target:`` The Cobalt algorithm target queue delay. The default value is 5 ms. diff --git a/src/traffic-control/model/cobalt-queue-disc.cc b/src/traffic-control/model/cobalt-queue-disc.cc index 7293532a3..33179ae02 100644 --- a/src/traffic-control/model/cobalt-queue-disc.cc +++ b/src/traffic-control/model/cobalt-queue-disc.cc @@ -54,11 +54,6 @@ TypeId CobaltQueueDisc::GetTypeId (void) MakeQueueSizeAccessor (&QueueDisc::SetMaxSize, &QueueDisc::GetMaxSize), MakeQueueSizeChecker ()) - .AddAttribute ("MinBytes", - "The Cobalt algorithm minbytes parameter.", - UintegerValue (1500), - MakeUintegerAccessor (&CobaltQueueDisc::m_minBytes), - MakeUintegerChecker ()) .AddAttribute ("Interval", "The Cobalt algorithm interval", StringValue ("100ms"), diff --git a/src/traffic-control/model/cobalt-queue-disc.h b/src/traffic-control/model/cobalt-queue-disc.h index 1d4366116..6afe6782c 100644 --- a/src/traffic-control/model/cobalt-queue-disc.h +++ b/src/traffic-control/model/cobalt-queue-disc.h @@ -214,8 +214,6 @@ private: // Common to CoDel and Blue // Maintained by Cobalt Stats m_stats; //!< Cobalt statistics - // Supplied by user - uint32_t m_minBytes; //!< Minimum bytes in queue to allow a packet drop // Codel parameters // Maintained by Cobalt diff --git a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc index 1c53515e3..be665cb9b 100644 --- a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc +++ b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc @@ -140,8 +140,6 @@ CobaltQueueDiscBasicEnqueueDequeue::DoRun (void) Address dest; - NS_TEST_EXPECT_MSG_EQ (queue->SetAttributeFailSafe ("MinBytes", UintegerValue (pktSize)), true, - "Verify that we can actually set the attribute MinBytes"); NS_TEST_EXPECT_MSG_EQ (queue->SetAttributeFailSafe ("Interval", StringValue ("50ms")), true, "Verify that we can actually set the attribute Interval"); NS_TEST_EXPECT_MSG_EQ (queue->SetAttributeFailSafe ("Target", StringValue ("4ms")), true,