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

NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION

Browse Source
This commit is contained in:
Mathieu Lacage
2008-04-15 15:10:53 -07:00
parent 22d1a6046d
commit 1649c1dc65
35 changed files with 505 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/node/queue.cc
View File

@@ -49,20 +49,19 @@ Queue::Queue() :
m_nTotalDroppedBytes(0),
m_nTotalDroppedPackets(0)
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
}
Queue::~Queue()
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
}
bool
Queue::Enqueue (Ptr<Packet> p)
{
NS_LOG_FUNCTION;
NS_LOG_PARAMS (this << p);
NS_LOG_FUNCTION (this << p);
NS_LOG_LOGIC ("m_traceEnqueue (p)");
m_traceEnqueue (p);
@@ -79,8 +78,7 @@ Queue::Enqueue (Ptr<Packet> p)
Ptr<Packet>
Queue::Dequeue (void)
{
NS_LOG_FUNCTION;
NS_LOG_PARAMS (this);
NS_LOG_FUNCTION (this);
Ptr<Packet> packet = DoDequeue ();
@@ -102,15 +100,14 @@ Queue::Dequeue (void)
void
Queue::DequeueAll (void)
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_ASSERT_MSG (0, "Don't know what to do with dequeued packets!");
}
Ptr<Packet>
Queue::Peek (void) const
{
NS_LOG_FUNCTION;
NS_LOG_PARAMS (this);
NS_LOG_FUNCTION (this);
return DoPeek ();
}
@@ -118,7 +115,7 @@ Queue::Peek (void) const
uint32_t
Queue::GetNPackets (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC ("returns " << m_nPackets);
return m_nPackets;
}
@@ -126,7 +123,7 @@ Queue::GetNPackets (void) const
uint32_t
Queue::GetNBytes (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC (" returns " << m_nBytes);
return m_nBytes;
}
@@ -134,7 +131,7 @@ Queue::GetNBytes (void) const
bool
Queue::IsEmpty (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC ("returns " << (m_nPackets == 0));
return m_nPackets == 0;
}
@@ -142,7 +139,7 @@ Queue::IsEmpty (void) const
uint32_t
Queue::GetTotalReceivedBytes (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC("returns " << m_nTotalReceivedBytes);
return m_nTotalReceivedBytes;
}
@@ -150,7 +147,7 @@ Queue::GetTotalReceivedBytes (void) const
uint32_t
Queue::GetTotalReceivedPackets (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC ("returns " << m_nTotalReceivedPackets);
return m_nTotalReceivedPackets;
}
@@ -158,7 +155,7 @@ Queue::GetTotalReceivedPackets (void) const
uint32_t
Queue:: GetTotalDroppedBytes (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC ("returns " << m_nTotalDroppedBytes);
return m_nTotalDroppedBytes;
}
@@ -166,7 +163,7 @@ Queue:: GetTotalDroppedBytes (void) const
uint32_t
Queue::GetTotalDroppedPackets (void) const
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
NS_LOG_LOGIC("returns " << m_nTotalDroppedPackets);
return m_nTotalDroppedPackets;
}
@@ -174,7 +171,7 @@ Queue::GetTotalDroppedPackets (void) const
void
Queue::ResetStatistics (void)
{
NS_LOG_FUNCTION;
NS_LOG_FUNCTION_NOARGS ();
m_nTotalReceivedBytes = 0;
m_nTotalReceivedPackets = 0;
m_nTotalDroppedBytes = 0;
@@ -184,8 +181,7 @@ Queue::ResetStatistics (void)
void
Queue::Drop (Ptr<Packet> p)
{
NS_LOG_FUNCTION;
NS_LOG_PARAMS (this << p);
NS_LOG_FUNCTION (this << p);
m_nTotalDroppedPackets++;
m_nTotalDroppedBytes += p->GetSize ();