--- a/src/node/drop-tail.cc Fri Feb 16 09:32:02 2007 +0100
+++ b/src/node/drop-tail.cc Fri Feb 16 09:34:28 2007 +0100
@@ -30,7 +30,7 @@
m_packets (),
m_maxPackets(DTQ_NPACKETS_MAX_DEFAULT)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DropTailQueue ()")
}
@@ -38,7 +38,7 @@
m_packets(),
m_maxPackets(DTQ_NPACKETS_MAX_DEFAULT)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DropTailQueue (" << &traceContainer << ")")
RegisterTraces(traceContainer);
@@ -46,14 +46,14 @@
DropTailQueue::~DropTailQueue ()
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::~DropTailQueue ()")
}
void
DropTailQueue::SetMaxPackets (uint32_t npackets)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::SetMaxPackets (" << npackets << ")")
m_maxPackets = npackets;
@@ -62,7 +62,7 @@
uint32_t
DropTailQueue::GetMaxPackets (void)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::GetMaxPackets () <= " << m_maxPackets)
return m_maxPackets;
@@ -71,12 +71,12 @@
bool
DropTailQueue::DoEnque (const Packet& p)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DoEnque (" << &p << ")")
if (m_nPackets >= m_maxPackets)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DoEnque (): Queue full -- droppping pkt")
Drop (p);
return false;
@@ -89,12 +89,12 @@
bool
DropTailQueue::DoDeque (Packet& p)
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DoDeque (" << &p << ")")
if (m_packets.empty())
{
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DoDeque (): Queue empty")
return false;
}
@@ -102,7 +102,7 @@
p = m_packets.front ();
m_packets.pop ();
- NS3_TRACE(dtqDebug,
+ NS_DEBUG(
"DropTailQueue::DoDeque (): Popped " << &p << " <= true")
return true;