From cc1fc37f2b8a445ac5c95df4a083de27dfd7a30d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 17 May 2010 07:29:43 -0700 Subject: [PATCH] fix enqueue trace for bug 913 --- src/node/queue.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/node/queue.cc b/src/node/queue.cc index 31fbe82b5..165ee0655 100644 --- a/src/node/queue.cc +++ b/src/node/queue.cc @@ -62,13 +62,16 @@ bool Queue::Enqueue (Ptr p) { NS_LOG_FUNCTION (this << p); - NS_LOG_LOGIC ("m_traceEnqueue (p)"); - - m_traceEnqueue (p); + // + // If DoEnqueue fails, Queue::Drop is called by the subclass + // bool retval = DoEnqueue (p); if (retval) { + NS_LOG_LOGIC ("m_traceEnqueue (p)"); + m_traceEnqueue (p); + uint32_t size = p->GetSize (); m_nBytes += size; m_nTotalReceivedBytes += size; @@ -95,7 +98,6 @@ Queue::Dequeue (void) m_nPackets--; NS_LOG_LOGIC("m_traceDequeue (packet)"); - m_traceDequeue (packet); } return packet;