From 855d5ce4b44306f555a757d2d318f36df499a3a8 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Tue, 9 Jun 2020 15:59:01 -0700 Subject: [PATCH] traffic-control: Remove unused counters --- src/traffic-control/model/codel-queue-disc.cc | 10 +--------- src/traffic-control/model/codel-queue-disc.h | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/traffic-control/model/codel-queue-disc.cc b/src/traffic-control/model/codel-queue-disc.cc index 95d39243b..44c6c44f9 100644 --- a/src/traffic-control/model/codel-queue-disc.cc +++ b/src/traffic-control/model/codel-queue-disc.cc @@ -132,11 +132,7 @@ CoDelQueueDisc::CoDelQueueDisc () m_dropping (false), m_recInvSqrt (~0U >> REC_INV_SQRT_SHIFT), m_firstAboveTime (0), - m_dropNext (0), - m_state1 (0), - m_state2 (0), - m_state3 (0), - m_states (0) + m_dropNext (0) { NS_LOG_FUNCTION (this); } @@ -226,7 +222,6 @@ CoDelQueueDisc::OkToDrop (Ptr item, uint32_t now) { NS_LOG_LOGIC ("Sojourn time has been above target for at least q->interval; it's OK to (possibly) drop packet."); okToDrop = true; - ++m_state1; } return okToDrop; } @@ -265,7 +260,6 @@ CoDelQueueDisc::DoDequeue (void) } else if (CoDelTimeAfterEq (now, m_dropNext)) { - m_state2++; while (m_dropping && CoDelTimeAfterEq (now, m_dropNext)) { ++m_count; @@ -338,7 +332,6 @@ CoDelQueueDisc::DoDequeue (void) OkToDrop (item, now); } m_dropping = true; - ++m_state3; /* * if min went above target close to when we last went below it * assume that the drop rate that controlled the queue on the @@ -367,7 +360,6 @@ CoDelQueueDisc::DoDequeue (void) { NS_LOG_LOGIC ("Marking due to CeThreshold " << m_ceThreshold.GetSeconds ()); } - ++m_states; return item; } diff --git a/src/traffic-control/model/codel-queue-disc.h b/src/traffic-control/model/codel-queue-disc.h index 1f1edc509..6adfdd11b 100644 --- a/src/traffic-control/model/codel-queue-disc.h +++ b/src/traffic-control/model/codel-queue-disc.h @@ -212,10 +212,6 @@ private: uint16_t m_recInvSqrt; //!< Reciprocal inverse square root uint32_t m_firstAboveTime; //!< Time to declare sojourn time above target TracedValue m_dropNext; //!< Time to drop next packet - uint32_t m_state1; //!< Number of times packet sojourn goes above target for interval - uint32_t m_state2; //!< Number of times we perform next drop while in dropping state - uint32_t m_state3; //!< Number of times we enter drop state and drop the fist packet - uint32_t m_states; //!< Total number of times we are in state 1, state 2, or state 3 }; } // namespace ns3