F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert NS3_TRACE to NS_DEBUG

Browse Source
This commit is contained in:
Mathieu Lacage
2007-02-16 09:34:28 +01:00
parent a49fb6556a
commit f2533a7645
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/trace-writer.cc
View File

@@ -33,7 +33,7 @@ namespace {
void
TraceWriter::Init (const char *filename)
{
NS3_TRACE(twDebug, "TraceWriter()::Init(" << filename << ")")
NS_DEBUG("TraceWriter()::Init(" << filename << ")")
std::streambuf *sb = m_filestr.rdbuf();
rdbuf(sb);
@@ -47,7 +47,7 @@ TraceWriter::Init (const char *filename)
TraceWriter::TraceWriter () :
m_filestr()
{
NS3_TRACE(twDebug, "TraceWriter()::TraceWriter()")
NS_DEBUG("TraceWriter()::TraceWriter()")
Init (0);
}
@@ -55,7 +55,7 @@ TraceWriter::TraceWriter () :
TraceWriter::TraceWriter (std::string const &filename) :
m_filestr()
{
NS3_TRACE(twDebug, "TraceWriter()::TraceWriter (\"" << filename << "\")")
NS_DEBUG("TraceWriter()::TraceWriter (\"" << filename << "\")")
Init (filename.c_str());
}
@@ -63,7 +63,7 @@ TraceWriter::TraceWriter (std::string const &filename) :
TraceWriter::TraceWriter (char const *filename) :
m_filestr()
{
NS3_TRACE(twDebug, "TraceWriter()::TraceWriter (\"" << filename << "\")")
NS_DEBUG("TraceWriter()::TraceWriter (\"" << filename << "\")")
Init (filename);
}
@@ -71,13 +71,13 @@ TraceWriter::TraceWriter (char const *filename) :
TraceWriter::~TraceWriter ()
{
NS3_TRACE(twDebug, "TraceWriter()::~TraceWriter()")
NS_DEBUG("TraceWriter()::~TraceWriter()")
}
void
TraceWriter::Open (std::string const &filename)
{
NS3_TRACE(twDebug, "TraceWriter()::Open (\"" << filename << "\")")
NS_DEBUG("TraceWriter()::Open (\"" << filename << "\")")
Init(filename.c_str());
}
@@ -85,7 +85,7 @@ TraceWriter::Open (std::string const &filename)
void
TraceWriter::Open (char const *filename)
{
NS3_TRACE(twDebug, "TraceWriter()::Open (\"" << filename << "\")")
NS_DEBUG("TraceWriter()::Open (\"" << filename << "\")")
Init(filename);
}
@@ -93,7 +93,7 @@ TraceWriter::Open (char const *filename)
void
TraceWriter::Close ()
{
NS3_TRACE(twDebug, "TraceWriter()::Close ()")
NS_DEBUG("TraceWriter()::Close ()")
m_filestr.close ();
}
@@ -101,7 +101,7 @@ TraceWriter::Close ()
void
TraceWriter::Write (std::string const &str)
{
NS3_TRACE(twDebug, "TraceWriter()::Write (\"" << str << "\")")
NS_DEBUG("TraceWriter()::Write (\"" << str << "\")")
m_filestr << str;
}

20
src/node/drop-tail.cc
View File

@@ -30,7 +30,7 @@ DropTailQueue::DropTailQueue () :
m_packets (),
m_maxPackets(DTQ_NPACKETS_MAX_DEFAULT)
{
NS3_TRACE(dtqDebug,
NS_DEBUG(
"DropTailQueue::DropTailQueue ()")
}
@@ -38,7 +38,7 @@ DropTailQueue::DropTailQueue (TraceContainer &traceContainer) :
m_packets(),
m_maxPackets(DTQ_NPACKETS_MAX_DEFAULT)
{
NS3_TRACE(dtqDebug,
NS_DEBUG(
"DropTailQueue::DropTailQueue (" << &traceContainer << ")")
RegisterTraces(traceContainer);
@@ -46,14 +46,14 @@ DropTailQueue::DropTailQueue (TraceContainer &traceContainer) :
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 @@ DropTailQueue::SetMaxPackets (uint32_t npackets)
uint32_t
DropTailQueue::GetMaxPackets (void)
{
NS3_TRACE(dtqDebug,
NS_DEBUG(
"DropTailQueue::GetMaxPackets () <= " << m_maxPackets)
return m_maxPackets;
@@ -71,12 +71,12 @@ DropTailQueue::GetMaxPackets (void)
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 @@ DropTailQueue::DoEnque (const Packet& p)
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 @@ DropTailQueue::DoDeque (Packet& p)
p = m_packets.front ();
m_packets.pop ();
NS3_TRACE(dtqDebug,
NS_DEBUG(
"DropTailQueue::DoDeque (): Popped " << &p << " <= true")
return true;

36
src/node/queue.cc
View File

@@ -34,20 +34,20 @@ Queue::Queue() :
m_nTotalDroppedBytes(0),
m_nTotalDroppedPackets(0)
{
NS3_TRACE(qDebug, "Queue::Queue ()")
NS_DEBUG("Queue::Queue ()")
}
Queue::~Queue()
{
NS3_TRACE(qDebug, "Queue::~Queue ()")
NS_DEBUG("Queue::~Queue ()")
}
bool
Queue::Enque (const Packet& p)
{
NS3_TRACE(qDebug, "Queue::Enque (" << &p << ")")
NS_DEBUG("Queue::Enque (" << &p << ")")
NS3_TRACE(qDebug, "Queue::Enque (): m_traceEnque (p)")
NS_DEBUG("Queue::Enque (): m_traceEnque (p)")
m_traceEnque ("+ <timestamp> ", p);
bool retval = DoEnque (p);
@@ -62,7 +62,7 @@ Queue::Enque (const Packet& p)
bool
Queue::Deque (Packet &p)
{
NS3_TRACE(qDebug, "Queue::Deque (" << &p << ")")
NS_DEBUG("Queue::Deque (" << &p << ")")
bool retval = DoDeque (p);
@@ -74,7 +74,7 @@ Queue::Deque (Packet &p)
assert(m_nBytes >= 0);
assert(m_nPackets >= 0);
NS3_TRACE(qDebug, "Queue::Deque (): m_traceDeque (p)")
NS_DEBUG("Queue::Deque (): m_traceDeque (p)")
m_traceDeque ("+ <timestamp> ", static_cast<const Packet &>(p));
}
@@ -84,7 +84,7 @@ Queue::Deque (Packet &p)
void
Queue::DequeAll (void)
{
NS3_TRACE(qDebug, "Queue::DequeAll ()")
NS_DEBUG("Queue::DequeAll ()")
assert (!"Don't know what to do with dequeued packets!");
}
@@ -92,7 +92,7 @@ Queue::DequeAll (void)
uint32_t
Queue::GetNPackets (void)
{
NS3_TRACE(qDebug, "Queue::GetNPackets () <= " << m_nPackets)
NS_DEBUG("Queue::GetNPackets () <= " << m_nPackets)
return m_nPackets;
}
@@ -100,7 +100,7 @@ Queue::GetNPackets (void)
uint32_t
Queue::GetNBytes (void)
{
NS3_TRACE(qDebug, "Queue::GetNBytes () <= " << m_nBytes)
NS_DEBUG("Queue::GetNBytes () <= " << m_nBytes)
return m_nBytes;
}
@@ -109,14 +109,14 @@ Queue::GetNBytes (void)
bool
Queue::IsEmpty (void)
{
NS3_TRACE(qDebug, "Queue::IsEmpty () <= " << (m_nPackets == 0))
NS_DEBUG("Queue::IsEmpty () <= " << (m_nPackets == 0))
return m_nPackets == 0;
}
void
Queue::RegisterTraces (TraceContainer &container)
{
NS3_TRACE(qDebug, "Queue::RegisterTraces (" << &container << ")")
NS_DEBUG("Queue::RegisterTraces (" << &container << ")")
container.RegisterCallback ("Queue::Enque", &m_traceEnque);
container.RegisterCallback ("Queue::Deque", &m_traceDeque);
@@ -126,7 +126,7 @@ Queue::RegisterTraces (TraceContainer &container)
uint32_t
Queue::GetTotalReceivedBytes (void)
{
NS3_TRACE(qDebug,
NS_DEBUG(
"Queue::GetTotalReceivedBytes () <= " << m_nTotalReceivedBytes)
return m_nTotalReceivedBytes;
@@ -135,7 +135,7 @@ Queue::GetTotalReceivedBytes (void)
uint32_t
Queue::GetTotalReceivedPackets (void)
{
NS3_TRACE(qDebug,
NS_DEBUG(
"Queue::GetTotalReceivedPackets () <= " << m_nTotalReceivedPackets)
return m_nTotalReceivedPackets;
@@ -144,7 +144,7 @@ Queue::GetTotalReceivedPackets (void)
uint32_t
Queue:: GetTotalDroppedBytes (void)
{
NS3_TRACE(qDebug,
NS_DEBUG(
"Queue::GetTotalDroppedBytes () <= " << m_nTotalDroppedBytes
)
return m_nTotalDroppedBytes;
@@ -153,7 +153,7 @@ Queue:: GetTotalDroppedBytes (void)
uint32_t
Queue::GetTotalDroppedPackets (void)
{
NS3_TRACE(qDebug,
NS_DEBUG(
"Queue::GetTotalDroppedPackets () <= " << m_nTotalDroppedPackets)
return m_nTotalDroppedPackets;
@@ -162,7 +162,7 @@ Queue::GetTotalDroppedPackets (void)
void
Queue::ResetStatistics (void)
{
NS3_TRACE(qDebug, "Queue::ResetStatistics ()")
NS_DEBUG("Queue::ResetStatistics ()")
m_nTotalReceivedBytes = 0;
m_nTotalReceivedPackets = 0;
@@ -173,12 +173,12 @@ Queue::ResetStatistics (void)
void
Queue::Drop (const Packet& p)
{
NS3_TRACE(qDebug, "Queue::Drop (" << &p << ")")
NS_DEBUG("Queue::Drop (" << &p << ")")
m_nTotalDroppedPackets++;
m_nTotalDroppedBytes += p.GetSize ();
NS3_TRACE(qDebug, "Queue::Drop (): m_traceDrop (p)")
NS_DEBUG("Queue::Drop (): m_traceDrop (p)")
m_traceEnque ("d <timestamp> ", p);
}