From 29b2db3a676327fc5e659652efae2d037b76485f Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 21 Feb 2007 20:04:32 +0100 Subject: [PATCH] make trailing ';' mandatory with NS_DEBUG macros. fix all invalid uses. --- samples/main-channel.cc | 34 +++++++++++++++++----------------- src/common/trace-writer.cc | 28 ++++++++++++++-------------- src/core/debug.h | 22 +++++++++++++++------- src/node/channel.cc | 14 +++++++------- src/node/drop-tail.cc | 4 ++-- src/node/layer-connector.cc | 28 ++++++++++++++-------------- src/node/queue.cc | 2 +- src/node/serial-net-device.cc | 24 ++++++++---------------- src/node/serial-phy.cc | 15 +++++---------- 9 files changed, 83 insertions(+), 88 deletions(-) diff --git a/samples/main-channel.cc b/samples/main-channel.cc index ffb83ae84..96ae7a6a7 100644 --- a/samples/main-channel.cc +++ b/samples/main-channel.cc @@ -48,19 +48,19 @@ protected: FakeInternetNode::FakeInternetNode () { - NS_DEBUG_UNCOND("FakeInternetNode::FakeInternetNode ()") + NS_DEBUG_UNCOND("FakeInternetNode::FakeInternetNode ()"); } FakeInternetNode::~FakeInternetNode () { - NS_DEBUG_UNCOND("FakeInternetNode::~FakeInternetNode ()") + NS_DEBUG_UNCOND("FakeInternetNode::~FakeInternetNode ()"); } void FakeInternetNode::Doit (void) { - NS_DEBUG_UNCOND("FakeInternetNode::Doit ()") - NS_DEBUG_UNCOND("FakeInternetNode::Doit (): **** Send outbound packet") + NS_DEBUG_UNCOND("FakeInternetNode::Doit ()"); + NS_DEBUG_UNCOND("FakeInternetNode::Doit (): **** Send outbound packet"); Packet p; m_dtqOutbound.Enque(p); @@ -70,9 +70,9 @@ FakeInternetNode::Doit (void) bool FakeInternetNode::UpperDoSendUp (Packet &p) { - NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (" << &p << ")") + NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (" << &p << ")"); - NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (): **** Receive inbound packet") + NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (): **** Receive inbound packet"); m_dtqInbound.Enque(p); return m_dtqInbound.Deque(p); } @@ -80,7 +80,7 @@ FakeInternetNode::UpperDoSendUp (Packet &p) bool FakeInternetNode::UpperDoPull (Packet &p) { - NS_DEBUG_UNCOND("FakeInternetNode::DoPull (" << &p << ")") + NS_DEBUG_UNCOND("FakeInternetNode::DoPull (" << &p << ")"); return m_dtqOutbound.Deque(p); } @@ -107,29 +107,29 @@ protected: FakePhysicalLayer::FakePhysicalLayer () { - NS_DEBUG_UNCOND("FakePhysicalLayer::FakePhysicalLayer ()") + NS_DEBUG_UNCOND("FakePhysicalLayer::FakePhysicalLayer ()"); } FakePhysicalLayer::~FakePhysicalLayer () { - NS_DEBUG_UNCOND("FakePhysicalLayer::~FakePhysicalLayer ()") + NS_DEBUG_UNCOND("FakePhysicalLayer::~FakePhysicalLayer ()"); } bool FakePhysicalLayer::LowerDoNotify (LayerConnectorUpper *upper) { - NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify ()") + NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify ()"); Packet p; - NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Starting pull") + NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Starting pull"); NS_ASSERT(m_upperPartner); m_upperPartner->UpperPull(p); m_dtqOutbound.Enque(p); - NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Got bits, Notify lower") + NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Got bits, Notify lower"); NS_ASSERT(m_lowerPartner); return m_lowerPartner->LowerNotify(this); @@ -138,7 +138,7 @@ FakePhysicalLayer::LowerDoNotify (LayerConnectorUpper *upper) bool FakePhysicalLayer::UpperDoSendUp (Packet &p) { - NS_DEBUG_UNCOND("FakePhysicalLayer::UpperDoSendUp (" << &p << ")") + NS_DEBUG_UNCOND("FakePhysicalLayer::UpperDoSendUp (" << &p << ")"); NS_ASSERT(m_upperPartner); return m_upperPartner->UpperSendUp(p); @@ -147,7 +147,7 @@ FakePhysicalLayer::UpperDoSendUp (Packet &p) bool FakePhysicalLayer::UpperDoPull (Packet &p) { - NS_DEBUG_UNCOND("FakePhysicalLayer::DoPull (" << &p << ")") + NS_DEBUG_UNCOND("FakePhysicalLayer::DoPull (" << &p << ")"); return m_dtqOutbound.Deque(p); } @@ -164,17 +164,17 @@ public: FakeChannel::FakeChannel () { - NS_DEBUG_UNCOND("FakeChannel::FakeChannel ()") + NS_DEBUG_UNCOND("FakeChannel::FakeChannel ()"); } FakeChannel::~FakeChannel () { - NS_DEBUG_UNCOND("FakeChannel::~FakeChannel ()") + NS_DEBUG_UNCOND("FakeChannel::~FakeChannel ()"); } int main (int argc, char *argv[]) { - NS_DEBUG_UNCOND("Channel Hackorama") + NS_DEBUG_UNCOND("Channel Hackorama"); #if 0 DebugComponentEnable("Queue"); diff --git a/src/common/trace-writer.cc b/src/common/trace-writer.cc index 653eda218..c851aa63e 100644 --- a/src/common/trace-writer.cc +++ b/src/common/trace-writer.cc @@ -31,56 +31,56 @@ namespace ns3 { TraceWriter::TraceWriter () : m_filestr() { - NS_DEBUG ("TraceWriter()::TraceWriter()") + NS_DEBUG ("TraceWriter()::TraceWriter()"); std::streambuf *sb = m_filestr.rdbuf(); - NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()") + NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()"); rdbuf(sb); - NS_DEBUG ("TraceWriter()::TraceWriter(): done") + NS_DEBUG ("TraceWriter()::TraceWriter(): done"); } TraceWriter::TraceWriter (std::string const &filename) : m_filestr() { - NS_DEBUG ("TraceWriter()::TraceWriter (\"" << filename << "\")") + NS_DEBUG ("TraceWriter()::TraceWriter (\"" << filename << "\")"); m_filestr.open (filename.c_str(), std::ios::out | std::ios::app); std::streambuf *sb = m_filestr.rdbuf(); - NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()") + NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()"); rdbuf(sb); - NS_DEBUG ("TraceWriter()::TraceWriter(): done") + NS_DEBUG ("TraceWriter()::TraceWriter(): done"); } TraceWriter::TraceWriter (char const *filename) : m_filestr() { - NS_DEBUG ("TraceWriter()::TraceWriter (\"" << filename << "\")") + NS_DEBUG ("TraceWriter()::TraceWriter (\"" << filename << "\")"); m_filestr.open (filename, std::ios::out | std::ios::app); std::streambuf *sb = m_filestr.rdbuf(); - NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()") + NS_DEBUG ("TraceWriter()::TraceWriter(): rdbuf ()"); rdbuf(sb); - NS_DEBUG ("TraceWriter()::TraceWriter(): done") + NS_DEBUG ("TraceWriter()::TraceWriter(): done"); } TraceWriter::~TraceWriter () { - NS_DEBUG ("TraceWriter()::~TraceWriter()") + NS_DEBUG ("TraceWriter()::~TraceWriter()"); } void TraceWriter::Open (std::string const &filename) { - NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")") + NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")"); m_filestr.open (filename.c_str(), std::ios::out | std::ios::app); } @@ -88,7 +88,7 @@ TraceWriter::Open (std::string const &filename) void TraceWriter::Open (char const *filename) { - NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")") + NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")"); m_filestr.open (filename, std::ios::out | std::ios::app); } @@ -96,7 +96,7 @@ TraceWriter::Open (char const *filename) void TraceWriter::Close () { - NS_DEBUG ("TraceWriter()::Close ()") + NS_DEBUG ("TraceWriter()::Close ()"); m_filestr.close (); } @@ -104,7 +104,7 @@ TraceWriter::Close () void TraceWriter::Write (std::string const &str) { - NS_DEBUG ("TraceWriter()::Write (\"" << str << "\")") + NS_DEBUG ("TraceWriter()::Write (\"" << str << "\")"); m_filestr << str; } diff --git a/src/core/debug.h b/src/core/debug.h index 34b85e6e4..d7bbfa2a6 100644 --- a/src/core/debug.h +++ b/src/core/debug.h @@ -93,7 +93,7 @@ private: * environment variable. */ #define NS_DEBUG_COMPONENT_DEFINE(name) \ - static ns3::DebugComponent g_debug = ns3::DebugComponent (name); + static ns3::DebugComponent g_debug = ns3::DebugComponent (name) /** * \ingroup debugging @@ -106,10 +106,14 @@ private: * same file. */ #define NS_DEBUG(msg) \ - if (g_debug.IsEnabled ()) \ - { \ - std::cout << msg << std::endl; \ - } + do \ + { \ + if (g_debug.IsEnabled ()) \ + { \ + std::cout << msg << std::endl; \ + } \ + } \ + while (false) /** * \ingroup debugging @@ -118,8 +122,12 @@ private: * Generate debugging output unconditionally in all * debug builds. */ -#define NS_DEBUG_UNCOND(msg) \ - std::cout << msg << std::endl; +#define NS_DEBUG_UNCOND(msg) \ + do \ + { \ + std::cout << msg << std::endl; \ + } \ + while (false) #else /* NS3_DEBUG_ENABLE */ diff --git a/src/node/channel.cc b/src/node/channel.cc index eaade96d2..efc350e27 100644 --- a/src/node/channel.cc +++ b/src/node/channel.cc @@ -30,18 +30,18 @@ namespace ns3 { Channel::Channel () { - NS_DEBUG("Channel::Channel ()") + NS_DEBUG("Channel::Channel ()"); } Channel::~Channel () { - NS_DEBUG("Channel::~Channel ()") + NS_DEBUG("Channel::~Channel ()"); } bool Channel::DoConnectToUpper (LayerConnectorUpper &upper) { - NS_DEBUG("Channel::DoConnectToUpper (" << &upper << ")") + NS_DEBUG("Channel::DoConnectToUpper (" << &upper << ")"); m_connectorList.push_back(&upper); return true; @@ -50,15 +50,15 @@ Channel::DoConnectToUpper (LayerConnectorUpper &upper) bool Channel::LowerDoNotify (LayerConnectorUpper *upper) { - NS_DEBUG("Channel::LowerDoNotify ()") + NS_DEBUG("Channel::LowerDoNotify ()"); Packet p; - NS_DEBUG("Channel::LowerDoNotify (): Starting pull") + NS_DEBUG("Channel::LowerDoNotify (): Starting pull"); upper->UpperPull(p); - NS_DEBUG("Channel::LowerDoNotify (): Got bits, Propagate()") + NS_DEBUG("Channel::LowerDoNotify (): Got bits, Propagate()"); return Propagate(p); } @@ -66,7 +66,7 @@ Channel::LowerDoNotify (LayerConnectorUpper *upper) bool Channel::Propagate (Packet &p) { - NS_DEBUG("Channel::Propagate (" << &p << ")") + NS_DEBUG("Channel::Propagate (" << &p << ")"); for (ConnectorList::const_iterator i = m_connectorList.begin (); i != m_connectorList.end (); diff --git a/src/node/drop-tail.cc b/src/node/drop-tail.cc index 22101d45a..ef8156465 100644 --- a/src/node/drop-tail.cc +++ b/src/node/drop-tail.cc @@ -91,14 +91,14 @@ DropTailQueue::DoDeque (Packet& p) if (m_packets.empty()) { - NS_DEBUG("DropTailQueue::DoDeque (): Queue empty") + NS_DEBUG("DropTailQueue::DoDeque (): Queue empty"); return false; } p = m_packets.front (); m_packets.pop (); - NS_DEBUG("DropTailQueue::DoDeque (): Popped " << &p << " <= true") + NS_DEBUG("DropTailQueue::DoDeque (): Popped " << &p << " <= true"); return true; } diff --git a/src/node/layer-connector.cc b/src/node/layer-connector.cc index 37ff55dc1..9134e9b1c 100644 --- a/src/node/layer-connector.cc +++ b/src/node/layer-connector.cc @@ -31,18 +31,18 @@ namespace ns3 { LayerConnectorUpper::LayerConnectorUpper () { - NS_DEBUG("LayerConnectorUpper::LayerConnectorUpper ()") + NS_DEBUG("LayerConnectorUpper::LayerConnectorUpper ()"); } LayerConnectorUpper::~LayerConnectorUpper () { - NS_DEBUG("LayerConnectorUpper::~LayerConnectorUpper ()") + NS_DEBUG("LayerConnectorUpper::~LayerConnectorUpper ()"); } bool LayerConnectorUpper::ConnectToLower (LayerConnectorLower &partner) { - NS_DEBUG("LayerConnectorUpper::ConnectToLower (" << &partner << ")") + NS_DEBUG("LayerConnectorUpper::ConnectToLower (" << &partner << ")"); return DoConnectToLower(partner); } @@ -50,7 +50,7 @@ LayerConnectorUpper::ConnectToLower (LayerConnectorLower &partner) bool LayerConnectorUpper::DoConnectToLower (LayerConnectorLower &partner) { - NS_DEBUG("LayerConnectorUpper::DoConnectToLower (" << &partner << ")") + NS_DEBUG("LayerConnectorUpper::DoConnectToLower (" << &partner << ")"); m_lowerPartner = &partner; NS_ASSERT (m_lowerPartner); @@ -60,7 +60,7 @@ LayerConnectorUpper::DoConnectToLower (LayerConnectorLower &partner) bool LayerConnectorUpper::UpperSendUp (Packet &p) { - NS_DEBUG("LayerConnectorUpper::UpperSendUp (" << &p << ")") + NS_DEBUG("LayerConnectorUpper::UpperSendUp (" << &p << ")"); return UpperDoSendUp(p); } @@ -68,7 +68,7 @@ LayerConnectorUpper::UpperSendUp (Packet &p) bool LayerConnectorUpper::UpperPull (Packet &p) { - NS_DEBUG("LayerConnectorUpper::UpperPull (" << &p << ")") + NS_DEBUG("LayerConnectorUpper::UpperPull (" << &p << ")"); return UpperDoPull(p); } @@ -76,7 +76,7 @@ LayerConnectorUpper::UpperPull (Packet &p) bool LayerConnectorUpper::UpperNotify () { - NS_DEBUG("LayerConnectorUpper::UpperNotify ()") + NS_DEBUG("LayerConnectorUpper::UpperNotify ()"); NS_ASSERT (m_lowerPartner); return m_lowerPartner->LowerNotify(this); @@ -84,18 +84,18 @@ LayerConnectorUpper::UpperNotify () LayerConnectorLower::LayerConnectorLower () { - NS_DEBUG("LayerConnectorLower::LayerConnectorLower ()") + NS_DEBUG("LayerConnectorLower::LayerConnectorLower ()"); } LayerConnectorLower::~LayerConnectorLower () { - NS_DEBUG("LayerConnectorLower::~LayerConnectorLower ()") + NS_DEBUG("LayerConnectorLower::~LayerConnectorLower ()"); } bool LayerConnectorLower::ConnectToUpper (LayerConnectorUpper &partner) { - NS_DEBUG("LayerConnectorLower::ConnectToUpper (" << &partner << ")") + NS_DEBUG("LayerConnectorLower::ConnectToUpper (" << &partner << ")"); return DoConnectToUpper(partner); } @@ -103,7 +103,7 @@ LayerConnectorLower::ConnectToUpper (LayerConnectorUpper &partner) bool LayerConnectorLower::DoConnectToUpper (LayerConnectorUpper &partner) { - NS_DEBUG("LayerConnectorLower::DoConnectToUpper (" << &partner << ")") + NS_DEBUG("LayerConnectorLower::DoConnectToUpper (" << &partner << ")"); m_upperPartner = &partner; NS_ASSERT (m_upperPartner); @@ -113,7 +113,7 @@ LayerConnectorLower::DoConnectToUpper (LayerConnectorUpper &partner) bool LayerConnectorLower::LowerSendUp (Packet &p) { - NS_DEBUG("LayerConnectorLower::LowerSendUp (" << &p << ")") + NS_DEBUG("LayerConnectorLower::LowerSendUp (" << &p << ")"); NS_ASSERT (m_upperPartner); return m_upperPartner->UpperSendUp(p); @@ -122,7 +122,7 @@ LayerConnectorLower::LowerSendUp (Packet &p) bool LayerConnectorLower::LowerPull (Packet &p) { - NS_DEBUG("LayerConnectorLower::LowerPull (" << &p << ")") + NS_DEBUG("LayerConnectorLower::LowerPull (" << &p << ")"); NS_ASSERT (m_upperPartner); return m_upperPartner->UpperPull(p); @@ -131,7 +131,7 @@ LayerConnectorLower::LowerPull (Packet &p) bool LayerConnectorLower::LowerNotify (LayerConnectorUpper *upper) { - NS_DEBUG("LayerConnectorLower::LowerNotify ()") + NS_DEBUG("LayerConnectorLower::LowerNotify ()"); return LowerDoNotify(upper); } diff --git a/src/node/queue.cc b/src/node/queue.cc index f36630c30..44ec2ad7f 100644 --- a/src/node/queue.cc +++ b/src/node/queue.cc @@ -165,7 +165,7 @@ Queue::GetTotalDroppedPackets (void) void Queue::ResetStatistics (void) { - NS_DEBUG("Queue::ResetStatistics ()") + NS_DEBUG("Queue::ResetStatistics ()"); m_nTotalReceivedBytes = 0; m_nTotalReceivedPackets = 0; diff --git a/src/node/serial-net-device.cc b/src/node/serial-net-device.cc index 18c21f5d7..452a5ae8c 100644 --- a/src/node/serial-net-device.cc +++ b/src/node/serial-net-device.cc @@ -37,8 +37,7 @@ namespace ns3 { SerialNetDevice::SerialNetDevice(Node* node, const MacAddress& addr) : NetDevice(node, addr) { - NS_DEBUG ( - "SerialNetDevice::SerialNetDevice (" << node << ", " << &addr << ")") + NS_DEBUG ("SerialNetDevice::SerialNetDevice (" << node << ", " << &addr << ")"); // BUGBUG FIXME // @@ -53,16 +52,14 @@ SerialNetDevice::SerialNetDevice(Node* node, const MacAddress& addr) : SerialNetDevice::~SerialNetDevice() { - NS_DEBUG ( - "SerialNetDevice::~SerialNetDevice ()") + NS_DEBUG ("SerialNetDevice::~SerialNetDevice ()"); } bool SerialNetDevice::SendTo (Packet& p, const MacAddress& dest) { - NS_DEBUG ( - "SerialNetDevice::SendTo (" << &p << ", " << &dest << ")") + NS_DEBUG ("SerialNetDevice::SendTo (" << &p << ", " << &dest << ")"); assert (IsLinkUp ()); @@ -82,8 +79,7 @@ SerialNetDevice::SendTo (Packet& p, const MacAddress& dest) bool SerialNetDevice::Attach (SerialChannel* ch) { - NS_DEBUG ( - "SerialNetDevice::Attach (" << &ch << ")") + NS_DEBUG ("SerialNetDevice::Attach (" << &ch << ")"); m_channel = ch; /* @@ -101,8 +97,7 @@ SerialNetDevice::Attach (SerialChannel* ch) void SerialNetDevice::AddQueue (Queue* q) { - NS_DEBUG ( - "SerialNetDevice::AddQueue (" << q << ")") + NS_DEBUG ("SerialNetDevice::AddQueue (" << q << ")"); m_queue = q; } @@ -111,8 +106,7 @@ void SerialNetDevice::Receive (Packet& p) { // ignore return value for now. - NS_DEBUG ( - "SerialNetDevice::Receive (" << &p << ")") + NS_DEBUG ("SerialNetDevice::Receive (" << &p << ")"); // Dispatch this to SerialPhy::Receive m_phy->Receive (p); @@ -121,8 +115,7 @@ SerialNetDevice::Receive (Packet& p) void SerialNetDevice::NotifyDataAvailable(void) { - NS_DEBUG ( - "SerialNetDevice::NotifyDataAvailable ()") + NS_DEBUG ("SerialNetDevice::NotifyDataAvailable ()"); Packet p; bool found = GetQueue ()->Deque (p); @@ -133,8 +126,7 @@ SerialNetDevice::NotifyDataAvailable(void) p.PeekTag (tag); // send packet to address tag.address #endif - NS_DEBUG ( - "SerialNetDevice::NotifyDataAvailable (): Dequeued") + NS_DEBUG ("SerialNetDevice::NotifyDataAvailable (): Dequeued"); m_channel->Send(p, this); } } diff --git a/src/node/serial-phy.cc b/src/node/serial-phy.cc index 2433277e0..f1be77736 100644 --- a/src/node/serial-phy.cc +++ b/src/node/serial-phy.cc @@ -32,21 +32,18 @@ namespace ns3 { SerialPhy::SerialPhy(Node* node, SerialNetDevice* netdevice) : m_node(node), m_netdevice(netdevice) { - NS_DEBUG ( - "SerialPhy::SerialPhy (" << node << ", " << netdevice << ")") + NS_DEBUG ("SerialPhy::SerialPhy (" << node << ", " << netdevice << ")"); } SerialPhy::~SerialPhy() { - NS_DEBUG ( - "SerialPhy::~SerialPhy ()") + NS_DEBUG ("SerialPhy::~SerialPhy ()"); } void SerialPhy::NotifyDataAvailable(void) { - NS_DEBUG ( - "SerialPhy::NotifyDataAvailable ()") + NS_DEBUG ("SerialPhy::NotifyDataAvailable ()"); Packet p; bool found = m_netdevice->GetQueue ()->Deque (p); @@ -57,8 +54,7 @@ SerialPhy::NotifyDataAvailable(void) p.PeekTag (tag); // send packet to address tag.address #endif - NS_DEBUG ( - "SerialPhy::NotifyDataAvailable (): Dequeued") + NS_DEBUG ("SerialPhy::NotifyDataAvailable (): Dequeued"); m_netdevice->GetChannel()->Send(p, m_netdevice); } } @@ -66,8 +62,7 @@ SerialPhy::NotifyDataAvailable(void) void SerialPhy::Receive (Packet& p) { - NS_DEBUG ( - "SerialPhy::Receive (" << &p << ")") + NS_DEBUG ("SerialPhy::Receive (" << &p << ")"); m_netdevice->ForwardUp (p); }