From 946e70807f4f28ecdb3c19618ca8b2dde94a416d Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Fri, 23 Feb 2018 15:46:09 +0100 Subject: [PATCH] traffic-control: Eliminate Visual Studio compiler warnings (based on Robert Ammon's patch) --- .../examples/codel-vs-pfifo-asymmetric.cc | 2 +- .../examples/codel-vs-pfifo-basic-test.cc | 2 +- src/traffic-control/examples/pfifo-vs-red.cc | 2 +- .../helper/queue-disc-container.cc | 2 +- .../helper/traffic-control-helper.cc | 8 ++-- src/traffic-control/model/codel-queue-disc.cc | 6 +-- .../model/fq-codel-queue-disc.cc | 2 +- src/traffic-control/model/pie-queue-disc.cc | 6 +-- src/traffic-control/model/pie-queue-disc.h | 4 +- src/traffic-control/model/queue-disc.cc | 6 +-- src/traffic-control/model/red-queue-disc.cc | 2 +- .../model/traffic-control-layer.cc | 4 +- .../adaptive-red-queue-disc-test-suite.cc | 9 ++-- .../test/codel-queue-disc-test-suite.cc | 43 +++++++++---------- .../test/pie-queue-disc-test-suite.cc | 25 ++++++----- .../test/red-queue-disc-test-suite.cc | 25 ++++++----- 16 files changed, 73 insertions(+), 75 deletions(-) diff --git a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc index d0ee361b3..4d8c3b5ba 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc @@ -232,7 +232,7 @@ int main (int argc, char *argv[]) uint32_t numOfDownLoadOnOffFlows = 1; // # of download onoff flows bool isPcapEnabled = true; - float startTime = 0.1; + float startTime = 0.1f; float simDuration = 60; //in seconds std::string fileNamePrefix = "codel-vs-pfifo-fast-asymmetric"; diff --git a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc index 209d2205f..2b805f403 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc @@ -87,7 +87,7 @@ int main (int argc, char *argv[]) uint32_t queueDiscSize = 1000; //in packets uint32_t queueSize = 10; //in packets uint32_t pktSize = 1458; //in bytes. 1458 to prevent fragments - float startTime = 0.1; + float startTime = 0.1f; float simDuration = 60; //in seconds bool isPcapEnabled = true; diff --git a/src/traffic-control/examples/pfifo-vs-red.cc b/src/traffic-control/examples/pfifo-vs-red.cc index fee10cd66..1dd18debb 100644 --- a/src/traffic-control/examples/pfifo-vs-red.cc +++ b/src/traffic-control/examples/pfifo-vs-red.cc @@ -166,7 +166,7 @@ int main (int argc, char *argv[]) std::cout << "Running the simulation" << std::endl; Simulator::Run (); - uint32_t totalRxBytesCounter = 0; + uint64_t totalRxBytesCounter = 0; for (uint32_t i = 0; i < sinkApps.GetN (); i++) { Ptr app = sinkApps.Get (i); diff --git a/src/traffic-control/helper/queue-disc-container.cc b/src/traffic-control/helper/queue-disc-container.cc index 69c172fca..02cbec27a 100644 --- a/src/traffic-control/helper/queue-disc-container.cc +++ b/src/traffic-control/helper/queue-disc-container.cc @@ -46,7 +46,7 @@ QueueDiscContainer::End (void) const uint32_t QueueDiscContainer::GetN (void) const { - return m_queueDiscs.size (); + return static_cast(m_queueDiscs.size ()); } Ptr diff --git a/src/traffic-control/helper/traffic-control-helper.cc b/src/traffic-control/helper/traffic-control-helper.cc index 38c51c656..4a6b52feb 100644 --- a/src/traffic-control/helper/traffic-control-helper.cc +++ b/src/traffic-control/helper/traffic-control-helper.cc @@ -53,7 +53,7 @@ uint16_t QueueDiscFactory::AddQueueDiscClass (ObjectFactory factory) { m_queueDiscClassesFactory.push_back (factory); - return m_queueDiscClassesFactory.size () - 1; + return static_cast(m_queueDiscClassesFactory.size () - 1); } void @@ -85,7 +85,7 @@ QueueDiscFactory::CreateQueueDisc (const std::vector > & queueDis } // create and add the queue disc classes - for (uint32_t i = 0; i < m_queueDiscClassesFactory.size (); i++) + for (uint16_t i = 0; i < m_queueDiscClassesFactory.size (); i++) { // the class ID is given by the index i of the vector NS_ABORT_MSG_IF (m_classIdChildHandleMap.find (i) == m_classIdChildHandleMap.end (), @@ -293,7 +293,7 @@ TrafficControlHelper::AddChildQueueDisc (uint16_t handle, uint16_t classId, std: factory.Set (n14, v14); factory.Set (n15, v15); - uint16_t childHandle = m_queueDiscFactory.size (); + uint16_t childHandle = static_cast(m_queueDiscFactory.size ()); m_queueDiscFactory.push_back (QueueDiscFactory (factory)); m_queueDiscFactory[handle].SetChildQueueDisc (classId, childHandle); @@ -367,7 +367,7 @@ TrafficControlHelper::Install (Ptr d) m_queueDiscs.resize (m_queueDiscFactory.size ()); // Create queue discs (from leaves to root) - for (int i = m_queueDiscFactory.size () - 1; i >= 0; i--) + for (auto i = m_queueDiscFactory.size () - 1; i >= 0; i--) { Ptr q = m_queueDiscFactory[i].CreateQueueDisc (m_queueDiscs); q->SetNetDevice (d); diff --git a/src/traffic-control/model/codel-queue-disc.cc b/src/traffic-control/model/codel-queue-disc.cc index 09322cf2c..392823e19 100644 --- a/src/traffic-control/model/codel-queue-disc.cc +++ b/src/traffic-control/model/codel-queue-disc.cc @@ -62,7 +62,7 @@ static uint32_t CoDelGetTime (void) Time time = Simulator::Now (); uint64_t ns = time.GetNanoSeconds (); - return ns >> CODEL_SHIFT; + return static_cast(ns >> CODEL_SHIFT); } @@ -158,7 +158,7 @@ CoDelQueueDisc::NewtonStep (void) val >>= 2; /* avoid overflow */ val = (val * invsqrt) >> (32 - 2 + 1); - m_recInvSqrt = val >> REC_INV_SQRT_SHIFT; + m_recInvSqrt = static_cast(val >> REC_INV_SQRT_SHIFT); } uint32_t @@ -458,7 +458,7 @@ CoDelQueueDisc::CoDelTimeBeforeEq (uint32_t a, uint32_t b) uint32_t CoDelQueueDisc::Time2CoDel (Time t) { - return (t.GetNanoSeconds () >> CODEL_SHIFT); + return static_cast(t.GetNanoSeconds () >> CODEL_SHIFT); } bool diff --git a/src/traffic-control/model/fq-codel-queue-disc.cc b/src/traffic-control/model/fq-codel-queue-disc.cc index d9545c65d..4b7c54246 100644 --- a/src/traffic-control/model/fq-codel-queue-disc.cc +++ b/src/traffic-control/model/fq-codel-queue-disc.cc @@ -279,7 +279,7 @@ FqCoDelQueueDisc::DoDequeue (void) } } while (item == 0); - flow->IncreaseDeficit (-item->GetSize ()); + flow->IncreaseDeficit (item->GetSize () * -1); return item; } diff --git a/src/traffic-control/model/pie-queue-disc.cc b/src/traffic-control/model/pie-queue-disc.cc index d341e443b..1714010cc 100644 --- a/src/traffic-control/model/pie-queue-disc.cc +++ b/src/traffic-control/model/pie-queue-disc.cc @@ -217,7 +217,7 @@ PieQueueDisc::InitializeParams (void) { // Initially queue is empty so variables are initialize to zero except m_dqCount m_inMeasurement = false; - m_dqCount = -1; + m_dqCount = DQCOUNT_INVALID; m_dropProb = 0; m_avgDqRate = 0.0; m_dqStart = 0; @@ -354,10 +354,10 @@ void PieQueueDisc::CalculateP () m_burstAllowance -= m_tUpdate; } - uint32_t burstResetLimit = BURST_RESET_TIMEOUT / m_tUpdate.GetSeconds (); + uint32_t burstResetLimit = static_cast(BURST_RESET_TIMEOUT / m_tUpdate.GetSeconds ()); if ( (qDelay.GetSeconds () < 0.5 * m_qDelayRef.GetSeconds ()) && (m_qDelayOld.GetSeconds () < (0.5 * m_qDelayRef.GetSeconds ())) && (m_dropProb == 0) && !missingInitFlag ) { - m_dqCount = -1; + m_dqCount = DQCOUNT_INVALID; m_avgDqRate = 0.0; } if ( (qDelay.GetSeconds () < 0.5 * m_qDelayRef.GetSeconds ()) && (m_qDelayOld.GetSeconds () < (0.5 * m_qDelayRef.GetSeconds ())) && (m_dropProb == 0) && (m_burstAllowance.GetSeconds () == 0)) diff --git a/src/traffic-control/model/pie-queue-disc.h b/src/traffic-control/model/pie-queue-disc.h index 5ed9256ab..e38b270c0 100644 --- a/src/traffic-control/model/pie-queue-disc.h +++ b/src/traffic-control/model/pie-queue-disc.h @@ -168,6 +168,8 @@ private: */ void CalculateP (); + static const uint64_t DQCOUNT_INVALID = std::numeric_limits::max(); //!< Invalid dqCount value + // ** Variables supplied by user QueueDiscMode m_mode; //!< Mode (bytes or packets) uint32_t m_queueLimit; //!< Queue limit in bytes / packets @@ -190,7 +192,7 @@ private: bool m_inMeasurement; //!< Indicates whether we are in a measurement cycle double m_avgDqRate; //!< Time averaged dequeue rate double m_dqStart; //!< Start timestamp of current measurement cycle - uint32_t m_dqCount; //!< Number of bytes departed since current measurement cycle starts + uint64_t m_dqCount; //!< Number of bytes departed since current measurement cycle starts EventId m_rtrsEvent; //!< Event used to decide the decision of interval of drop probability calculation Ptr m_uv; //!< Rng stream }; diff --git a/src/traffic-control/model/queue-disc.cc b/src/traffic-control/model/queue-disc.cc index b1ecf954a..5f6b24aaa 100644 --- a/src/traffic-control/model/queue-disc.cc +++ b/src/traffic-control/model/queue-disc.cc @@ -498,7 +498,7 @@ QueueDisc::GetInternalQueue (uint32_t i) const uint32_t QueueDisc::GetNInternalQueues (void) const { - return m_queues.size (); + return static_cast(m_queues.size ()); } void @@ -518,7 +518,7 @@ QueueDisc::GetPacketFilter (uint32_t i) const uint32_t QueueDisc::GetNPacketFilters (void) const { - return m_filters.size (); + return static_cast(m_filters.size ()); } void @@ -556,7 +556,7 @@ QueueDisc::GetQueueDiscClass (uint32_t i) const uint32_t QueueDisc::GetNQueueDiscClasses (void) const { - return m_classes.size (); + return static_cast(m_classes.size ()); } int32_t diff --git a/src/traffic-control/model/red-queue-disc.cc b/src/traffic-control/model/red-queue-disc.cc index abfb4ddf1..2763fe8da 100644 --- a/src/traffic-control/model/red-queue-disc.cc +++ b/src/traffic-control/model/red-queue-disc.cc @@ -669,7 +669,7 @@ RedQueueDisc::Estimator (uint32_t nQueued, uint32_t m, double qAvg, double qW) { NS_LOG_FUNCTION (this << nQueued << m << qAvg << qW); - double newAve = qAvg * pow(1.0-qW, m); + double newAve = qAvg * std::pow (1.0 - qW, m); newAve += qW * nQueued; Time now = Simulator::Now (); diff --git a/src/traffic-control/model/traffic-control-layer.cc b/src/traffic-control/model/traffic-control-layer.cc index a4af59fe8..968f78fd2 100644 --- a/src/traffic-control/model/traffic-control-layer.cc +++ b/src/traffic-control/model/traffic-control-layer.cc @@ -106,7 +106,7 @@ TrafficControlLayer::DoInitialize (void) // set the wake callbacks on netdevice queues if (ndi->second.m_rootQueueDisc->GetWakeMode () == QueueDisc::WAKE_ROOT) { - for (uint32_t i = 0; i < devQueueIface->GetNTxQueues (); i++) + for (uint8_t i = 0; i < devQueueIface->GetNTxQueues (); i++) { devQueueIface->GetTxQueue (i)->SetWakeCallback (MakeCallback (&QueueDisc::Run, ndi->second.m_rootQueueDisc)); ndi->second.m_queueDiscsToWake.push_back (ndi->second.m_rootQueueDisc); @@ -116,7 +116,7 @@ TrafficControlLayer::DoInitialize (void) { NS_ASSERT_MSG (ndi->second.m_rootQueueDisc->GetNQueueDiscClasses () == devQueueIface->GetNTxQueues (), "The number of child queue discs does not match the number of netdevice queues"); - for (uint32_t i = 0; i < devQueueIface->GetNTxQueues (); i++) + for (uint8_t i = 0; i < devQueueIface->GetNTxQueues (); i++) { devQueueIface->GetTxQueue (i)->SetWakeCallback (MakeCallback (&QueueDisc::Run, ndi->second.m_rootQueueDisc->GetQueueDiscClass (i)->GetQueueDisc ())); diff --git a/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc b/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc index d43934391..ec4e7cc7e 100644 --- a/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc +++ b/src/traffic-control/test/adaptive-red-queue-disc-test-suite.cc @@ -49,9 +49,8 @@ public: * * \param p packet * \param addr address - * \param protocol protocol */ - AredQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol); + AredQueueDiscTestItem (Ptr p, const Address & addr); virtual ~AredQueueDiscTestItem (); virtual void AddHeader (void); virtual bool Mark(void); @@ -71,8 +70,8 @@ private: AredQueueDiscTestItem &operator = (const AredQueueDiscTestItem &); }; -AredQueueDiscTestItem::AredQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol) - : QueueDiscItem (p, addr, protocol) +AredQueueDiscTestItem::AredQueueDiscTestItem (Ptr p, const Address & addr) + : QueueDiscItem (p, addr, 0) { } @@ -356,7 +355,7 @@ AredQueueDiscTestCase::Enqueue (Ptr queue, uint32_t size, uint32_t Address dest; for (uint32_t i = 0; i < nPkt; i++) { - queue->Enqueue (Create (Create (size), dest, 0)); + queue->Enqueue (Create (Create (size), dest)); } } diff --git a/src/traffic-control/test/codel-queue-disc-test-suite.cc b/src/traffic-control/test/codel-queue-disc-test-suite.cc index 774b14005..a0a19b6a1 100644 --- a/src/traffic-control/test/codel-queue-disc-test-suite.cc +++ b/src/traffic-control/test/codel-queue-disc-test-suite.cc @@ -45,7 +45,7 @@ static uint16_t _codel_Newton_step (uint32_t count, uint16_t rec_inv_sqrt) val >>= 2; /* avoid overflow in following multiply */ val = (val * invsqrt) >> (32 - 2 + 1); - return (val >> REC_INV_SQRT_SHIFT_ns3); + return static_cast(val >> REC_INV_SQRT_SHIFT_ns3); } static uint32_t _reciprocal_scale (uint32_t val, uint32_t ep_ro) @@ -67,9 +67,8 @@ public: * * \param p packet * \param addr address - * \param protocol */ - CodelQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol); + CodelQueueDiscTestItem (Ptr p, const Address & addr); virtual ~CodelQueueDiscTestItem (); virtual void AddHeader (void); virtual bool Mark(void); @@ -89,8 +88,8 @@ private: CodelQueueDiscTestItem &operator = (const CodelQueueDiscTestItem &); }; -CodelQueueDiscTestItem::CodelQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol) - : QueueDiscItem (p, addr, protocol) +CodelQueueDiscTestItem::CodelQueueDiscTestItem (Ptr p, const Address & addr) + : QueueDiscItem (p, addr, 0) { } @@ -198,17 +197,17 @@ CoDelQueueDiscBasicEnqueueDequeue::DoRun (void) p6 = Create (pktSize); QueueTestSize (queue, 0 * modeSize, "There should be no packets in queue"); - queue->Enqueue (Create (p1, dest, 0)); + queue->Enqueue (Create (p1, dest)); QueueTestSize (queue, 1 * modeSize, "There should be one packet in queue"); - queue->Enqueue (Create (p2, dest, 0)); + queue->Enqueue (Create (p2, dest)); QueueTestSize (queue, 2 * modeSize, "There should be two packets in queue"); - queue->Enqueue (Create (p3, dest, 0)); + queue->Enqueue (Create (p3, dest)); QueueTestSize (queue, 3 * modeSize, "There should be three packets in queue"); - queue->Enqueue (Create (p4, dest, 0)); + queue->Enqueue (Create (p4, dest)); QueueTestSize (queue, 4 * modeSize, "There should be four packets in queue"); - queue->Enqueue (Create (p5, dest, 0)); + queue->Enqueue (Create (p5, dest)); QueueTestSize (queue, 5 * modeSize, "There should be five packets in queue"); - queue->Enqueue (Create (p6, dest, 0)); + queue->Enqueue (Create (p6, dest)); QueueTestSize (queue, 6 * modeSize, "There should be six packets in queue"); NS_TEST_EXPECT_MSG_EQ (queue->GetStats ().GetNDroppedPackets (CoDelQueueDisc::OVERLIMIT_DROP), @@ -343,9 +342,9 @@ CoDelQueueDiscBasicOverflow::DoRun (void) queue->Initialize (); Enqueue (queue, pktSize, 500); - queue->Enqueue (Create (p1, dest, 0)); - queue->Enqueue (Create (p2, dest, 0)); - queue->Enqueue (Create (p3, dest, 0)); + queue->Enqueue (Create (p1, dest)); + queue->Enqueue (Create (p2, dest)); + queue->Enqueue (Create (p3, dest)); QueueTestSize (queue, 500 * modeSize, "There should be 500 packets in queue"); NS_TEST_EXPECT_MSG_EQ (queue->GetStats ().GetNDroppedPackets (CoDelQueueDisc::OVERLIMIT_DROP), @@ -358,7 +357,7 @@ CoDelQueueDiscBasicOverflow::Enqueue (Ptr queue, uint32_t size, Address dest; for (uint32_t i = 0; i < nPkt; i++) { - queue->Enqueue (Create (Create (size), dest, 0)); + queue->Enqueue (Create (Create (size), dest)); } } @@ -453,12 +452,10 @@ CoDelQueueDiscControlLawTest::DoRun (void) for (int i = 0; i < 4; ++i) { - uint32_t ns3Result = queue->ControlLaw (dropNextTestVals[i]); - uint32_t upperBound = ns3Result + 0.02 * ns3Result; - uint32_t lowerBound = ns3Result - 0.02 * ns3Result; - uint32_t linuxResult = _codel_control_law (queue, dropNextTestVals[i]); - NS_TEST_EXPECT_MSG_EQ ((lowerBound < linuxResult || linuxResult < upperBound), true, - "Linux result should stay within 2% of ns-3 result"); + uint32_t ns3Result = queue->ControlLaw(dropNextTestVals[i]); + uint32_t linuxResult = _codel_control_law(queue, dropNextTestVals[i]); + NS_TEST_EXPECT_MSG_EQ((0.98 * ns3Result < linuxResult && linuxResult < 1.02 * ns3Result), true, + "Linux result should stay within 2% of ns-3 result"); } } @@ -532,6 +529,8 @@ CoDelQueueDiscBasicDrop::CoDelQueueDiscBasicDrop (std::string mode) void CoDelQueueDiscBasicDrop::DropNextTracer (uint32_t oldVal, uint32_t newVal) { + NS_UNUSED(oldVal); + NS_UNUSED(newVal); m_dropNextCount++; } @@ -586,7 +585,7 @@ CoDelQueueDiscBasicDrop::Enqueue (Ptr queue, uint32_t size, uint Address dest; for (uint32_t i = 0; i < nPkt; i++) { - queue->Enqueue (Create (Create (size), dest, 0)); + queue->Enqueue (Create (Create (size), dest)); } } diff --git a/src/traffic-control/test/pie-queue-disc-test-suite.cc b/src/traffic-control/test/pie-queue-disc-test-suite.cc index 053e93137..4043b8dc6 100644 --- a/src/traffic-control/test/pie-queue-disc-test-suite.cc +++ b/src/traffic-control/test/pie-queue-disc-test-suite.cc @@ -46,9 +46,8 @@ public: * * \param p the packet * \param addr the address - * \param protocol the protocol */ - PieQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol); + PieQueueDiscTestItem (Ptr p, const Address & addr); virtual ~PieQueueDiscTestItem (); virtual void AddHeader (void); virtual bool Mark (void); @@ -68,8 +67,8 @@ private: PieQueueDiscTestItem &operator = (const PieQueueDiscTestItem &); }; -PieQueueDiscTestItem::PieQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol) - : QueueDiscItem (p, addr, protocol) +PieQueueDiscTestItem::PieQueueDiscTestItem (Ptr p, const Address & addr) + : QueueDiscItem (p, addr, 0) { } @@ -180,16 +179,16 @@ PieQueueDiscTestCase::RunPieTest (StringValue mode) queue->Initialize (); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 0 * modeSize, "There should be no packets in there"); - queue->Enqueue (Create (p1, dest, 0)); + queue->Enqueue (Create (p1, dest)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 1 * modeSize, "There should be one packet in there"); - queue->Enqueue (Create (p2, dest, 0)); + queue->Enqueue (Create (p2, dest)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 2 * modeSize, "There should be two packets in there"); - queue->Enqueue (Create (p3, dest, 0)); - queue->Enqueue (Create (p4, dest, 0)); - queue->Enqueue (Create (p5, dest, 0)); - queue->Enqueue (Create (p6, dest, 0)); - queue->Enqueue (Create (p7, dest, 0)); - queue->Enqueue (Create (p8, dest, 0)); + queue->Enqueue (Create (p3, dest)); + queue->Enqueue (Create (p4, dest)); + queue->Enqueue (Create (p5, dest)); + queue->Enqueue (Create (p6, dest)); + queue->Enqueue (Create (p7, dest)); + queue->Enqueue (Create (p8, dest)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 8 * modeSize, "There should be eight packets in there"); Ptr item; @@ -350,7 +349,7 @@ PieQueueDiscTestCase::Enqueue (Ptr queue, uint32_t size, uint32_t Address dest; for (uint32_t i = 0; i < nPkt; i++) { - queue->Enqueue (Create (Create (size), dest, 0)); + queue->Enqueue (Create (Create (size), dest)); } } diff --git a/src/traffic-control/test/red-queue-disc-test-suite.cc b/src/traffic-control/test/red-queue-disc-test-suite.cc index 09beb90b7..26649c311 100644 --- a/src/traffic-control/test/red-queue-disc-test-suite.cc +++ b/src/traffic-control/test/red-queue-disc-test-suite.cc @@ -44,10 +44,9 @@ public: * * \param p packet * \param addr address - * \param protocol protocol * \param ecnCapable ECN capable flag */ - RedQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol, bool ecnCapable); + RedQueueDiscTestItem (Ptr p, const Address & addr, bool ecnCapable); virtual ~RedQueueDiscTestItem (); virtual void AddHeader (void); virtual bool Mark(void); @@ -68,8 +67,8 @@ private: bool m_ecnCapablePacket; ///< ECN capable packet? }; -RedQueueDiscTestItem::RedQueueDiscTestItem (Ptr p, const Address & addr, uint16_t protocol, bool ecnCapable) - : QueueDiscItem (p, addr, protocol), +RedQueueDiscTestItem::RedQueueDiscTestItem (Ptr p, const Address & addr, bool ecnCapable) + : QueueDiscItem (p, addr, 0), m_ecnCapablePacket (ecnCapable) { } @@ -171,16 +170,16 @@ RedQueueDiscTestCase::RunRedTest (StringValue mode) queue->Initialize (); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 0 * modeSize, "There should be no packets in there"); - queue->Enqueue (Create (p1, dest, 0, false)); + queue->Enqueue (Create (p1, dest, false)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 1 * modeSize, "There should be one packet in there"); - queue->Enqueue (Create (p2, dest, 0, false)); + queue->Enqueue (Create (p2, dest, false)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 2 * modeSize, "There should be two packets in there"); - queue->Enqueue (Create (p3, dest, 0, false)); - queue->Enqueue (Create (p4, dest, 0, false)); - queue->Enqueue (Create (p5, dest, 0, false)); - queue->Enqueue (Create (p6, dest, 0, false)); - queue->Enqueue (Create (p7, dest, 0, false)); - queue->Enqueue (Create (p8, dest, 0, false)); + queue->Enqueue (Create (p3, dest, false)); + queue->Enqueue (Create (p4, dest, false)); + queue->Enqueue (Create (p5, dest, false)); + queue->Enqueue (Create (p6, dest, false)); + queue->Enqueue (Create (p7, dest, false)); + queue->Enqueue (Create (p8, dest, false)); NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 8 * modeSize, "There should be eight packets in there"); Ptr item; @@ -529,7 +528,7 @@ RedQueueDiscTestCase::Enqueue (Ptr queue, uint32_t size, uint32_t Address dest; for (uint32_t i = 0; i < nPkt; i++) { - queue->Enqueue (Create (Create (size), dest, 0, ecnCapable)); + queue->Enqueue (Create (Create (size), dest, ecnCapable)); } }