commit 0ac399e55ae2be82197deee12dc26d1149e97dcd
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Apr 27 13:28:28 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Apr 27 13:28:28 2012 -0700
tree e7eba697149700f20ed73716064a4b12f3a4fb5c
parent 1f8f0686e64ad890f068b15f7f7a2904423461c0

Checkpoint

ns3/sync-ccnx-wrapper.cc

diff --git a/ns3/sync-ccnx-wrapper.cc b/ns3/sync-ccnx-wrapper.cc
index b61f034..5260dfc 100644
--- a/ns3/sync-ccnx-wrapper.cc
+++ b/ns3/sync-ccnx-wrapper.cc
@@ -108,7 +108,9 @@
   is >> *name;
   
   CcnxInterestHeader interestHeader;
-  interestHeader.SetNonce            (m_rand.GetValue ());
+  uint32_t nonce = m_rand.GetValue ();
+  _LOG_DEBUG ("Nonce: " << nonce);
+  interestHeader.SetNonce            (nonce);
   interestHeader.SetName             (name);
   interestHeader.SetInterestLifetime (Seconds (10000.0)); // really long-lived interests
 

ns3/sync-log.h

diff --git a/ns3/sync-log.h b/ns3/sync-log.h
index 6dbc930..9da0dc8 100644
--- a/ns3/sync-log.h
+++ b/ns3/sync-log.h
@@ -27,6 +27,8 @@
 
 #include <ns3/log.h>
 
+#ifdef _DEBUG
+
 #define INIT_LOGGER(name) NS_LOG_COMPONENT_DEFINE(name);
 
 #define _LOG_INFO(x) NS_LOG_INFO(x)
@@ -41,6 +43,17 @@
 
 #else
 
+#define INIT_LOGGER(name) 
+#define _LOG_INFO(x) 
+#define _LOG_DEBUG(x) 
+#define _LOG_TRACE(x)
+#define _LOG_FUNCTION(x)
+#define _LOG_FUNCTION_NOARGS
+
+#endif
+
+#else
+
 #ifdef HAVE_LOG4CXX
 
 #include <log4cxx/logger.h>

ns3/sync-scheduler.cc

diff --git a/ns3/sync-scheduler.cc b/ns3/sync-scheduler.cc
index 95e4bf8..025eb3e 100644
--- a/ns3/sync-scheduler.cc
+++ b/ns3/sync-scheduler.cc
@@ -50,7 +50,7 @@
 void
 Scheduler::schedule (const TimeDuration &reltime, Event event, uint32_t label)
 {
-  NS_LOG_DEBUG ("Schedule event for " << (Simulator::Now () +reltime).ToDouble (Time::S) << "s for label " << label);
+  _LOG_DEBUG ("Schedule event for " << (Simulator::Now () +reltime).ToDouble (Time::S) << "s for label " << label);
   
   list< EventId > &eventsForLabel = m_labeledEvents [label];
   list< EventId >::iterator i = eventsForLabel.begin ();
@@ -75,7 +75,7 @@
 Scheduler::cancel (uint32_t label)
 {
   list< EventId > &eventsForLabel = m_labeledEvents [label];
-  NS_LOG_DEBUG ("Canceling events for label " << label << " (" << eventsForLabel.size () << " events)");
+  _LOG_DEBUG ("Canceling events for label " << label << " (" << eventsForLabel.size () << " events)");
 
   for (list< EventId >::iterator i = eventsForLabel.begin ();
        i != eventsForLabel.end ();