commit 420dbf0462f2e27f5140358237d41c69252b275b
author jeraldabraham <jeraldabraham@email.arizona.edu> Fri Apr 25 22:58:31 2014 -0700
committer jeraldabraham <jeraldabraham@email.arizona.edu> Fri Apr 25 23:34:57 2014 -0700
tree b3a79c2cda26f10ba1d71f928731fd88f896d0e5
parent dbfee2ea16f3169832f93afca9884e334e4133b5

Changes to support ndn-cpp-dev -> ndn-cxx renaming and adding quiet
logging option (-q)

Change-Id: Ifd28ec81d49e75191abd25788ef35c2125d456b1

src/ndn-traffic-server.cpp

diff --git a/src/ndn-traffic-server.cpp b/src/ndn-traffic-server.cpp
index ff56fe0..916b0e4 100644
--- a/src/ndn-traffic-server.cpp
+++ b/src/ndn-traffic-server.cpp
@@ -8,18 +8,20 @@
  */
 
 #include <sstream>
+
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/noncopyable.hpp>
 
-#include <ndn-cpp-dev/face.hpp>
-#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 #include "logger.hpp"
 
 namespace ndn {
 
-class NdnTrafficServer
+class NdnTrafficServer : boost::noncopyable
 {
 public:
 
@@ -28,6 +30,7 @@
     : m_logger("NdnTrafficServer")
     , m_programName(programName)
     , m_hasError(false)
+    , m_hasQuietLogging(false)
     , m_nRegistrationsFailed(0)
     , m_nMaximumInterests(-1)
     , m_nInterestsReceived(0)
@@ -162,6 +165,7 @@
       "Set environment variable NDN_TRAFFIC_LOGFOLDER for redirecting output to a log.\n"
       "  [-d interval] - set delay before responding to interest in milliseconds\n"
       "  [-c count]    - specify maximum number of interests to be satisfied\n"
+      "  [-q]          - quiet logging - no interest reception/data generation messages\n"
       "  [-h]          - print help and exit\n\n";
     exit(1);
 
@@ -196,6 +200,12 @@
   }
 
   void
+  setQuietLogging()
+  {
+    m_hasQuietLogging = true;
+  }
+
+  void
   signalHandler()
   {
     logStatistics();
@@ -368,7 +378,8 @@
         logLine += ", LocalID=" +
           boost::lexical_cast<std::string>(m_trafficPatterns[patternId].m_nInterestsReceived);
         logLine += ", Name=" + m_trafficPatterns[patternId].m_name;
-        m_logger.log(logLine, true, false);
+        if (!m_hasQuietLogging)
+          m_logger.log(logLine, true, false);
         if (m_trafficPatterns[patternId].m_contentDelay > time::milliseconds(-1))
           usleep(m_trafficPatterns[patternId].m_contentDelay.count() * 1000);
         if (m_contentDelay > time::milliseconds(-1))
@@ -440,6 +451,7 @@
   KeyChain m_keyChain;
   std::string m_programName;
   bool m_hasError;
+  bool m_hasQuietLogging;
   std::string m_instanceId;
   time::milliseconds m_contentDelay;
   int m_nRegistrationsFailed;
@@ -460,7 +472,7 @@
   std::srand(std::time(0));
   ndn::NdnTrafficServer ndnTrafficServer(argv[0]);
   int option;
-  while ((option = getopt(argc, argv, "hc:d:")) != -1) {
+  while ((option = getopt(argc, argv, "hqc:d:")) != -1) {
     switch (option) {
     case 'h':
       ndnTrafficServer.usage();
@@ -471,6 +483,9 @@
     case 'd':
       ndnTrafficServer.setContentDelay(atoi(optarg));
       break;
+    case 'q':
+      ndnTrafficServer.setQuietLogging();
+      break;
     default:
       ndnTrafficServer.usage();
       break;