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

Bug 1170: Formulate best practices for dealing with unused debug variables.

Browse Source
This commit is contained in:
Andrey Mazo
2012-02-10 19:02:12 +04:00
parent 9bd05e75e1
commit cec21ade43
31 changed files with 163 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
examples/routing/manet-routing-compare.cc
View File

@@ -117,6 +117,28 @@ RoutingExperiment::RoutingExperiment ()
{
}
std::string
PrintReceivedPacket (Ptr<Socket> socket, Ptr<Packet> packet)
{
SocketAddressTag tag;
bool found;
found = packet->PeekPacketTag (tag);
std::ostringstream oss;
oss << Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId ();
if (found)
{
InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ());
oss << " received one packet from " << addr.GetIpv4 ();
}
else
{
oss << " received one packet!";
}
return oss.str ();
}
void
RoutingExperiment::ReceivePacket (Ptr<Socket> socket)
{
@@ -125,23 +147,7 @@ RoutingExperiment::ReceivePacket (Ptr<Socket> socket)
{
bytesTotal += packet->GetSize ();
packetsReceived += 1;
SocketAddressTag tag;
bool found;
found = packet->PeekPacketTag (tag);
if (found)
{
InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ());
NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId ()
<< " received one packet from " << addr.GetIpv4 ());
//cast addr to void, to suppress 'addr' set but not used
//compiler warning in optimized builds
(void) addr;
}
else
{
NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId ()
<< " received one packet!");
}
NS_LOG_UNCOND (PrintReceivedPacket (socket, packet));
}
}