Added logging.hpp.
diff --git a/Makefile.am b/Makefile.am
index e048426..e67a5bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,10 +47,10 @@
config.h \
ndn-cpp/common.hpp ndn-cpp/common.cpp \
ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
- ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
- ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/face.cpp ndn-cpp/face.hpp \
ndn-cpp/forwarding-entry.cpp ndn-cpp/c/forwarding-entry.h ndn-cpp/forwarding-entry.hpp \
+ ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
+ ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
ndn-cpp/node.cpp ndn-cpp/node.hpp \
ndn-cpp/publisher-public-key-digest.hpp \
@@ -72,6 +72,7 @@
ndn-cpp/util/blob.hpp \
ndn-cpp/util/changed-event.cpp ndn-cpp/util/changed-event.hpp \
ndn-cpp/util/dynamic-uchar-vector.cpp ndn-cpp/util/dynamic-uchar-vector.hpp \
+ ndn-cpp/util/logging.cpp ndn-cpp/util/logging.hpp \
ndn-cpp/util/signed-blob.hpp
bin_test_encode_decode_forwarding_entry_SOURCES = tests/test-encode-decode-forwarding-entry.cpp
diff --git a/Makefile.in b/Makefile.in
index 26569c9..4e78d17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -154,9 +154,9 @@
am__v_lt_1 =
libndn_cpp_la_LIBADD =
am_libndn_cpp_la_OBJECTS = ndn-cpp/common.lo ndn-cpp/data.lo \
- ndn-cpp/interest.lo ndn-cpp/key.lo ndn-cpp/face.lo \
- ndn-cpp/forwarding-entry.lo ndn-cpp/name.lo ndn-cpp/node.lo \
- ndn-cpp/sha256-with-rsa-signature.lo \
+ ndn-cpp/face.lo ndn-cpp/forwarding-entry.lo \
+ ndn-cpp/interest.lo ndn-cpp/key.lo ndn-cpp/name.lo \
+ ndn-cpp/node.lo ndn-cpp/sha256-with-rsa-signature.lo \
ndn-cpp/encoding/binary-xml-element-reader.lo \
ndn-cpp/encoding/binary-xml-wire-format.lo \
ndn-cpp/encoding/wire-format.lo ndn-cpp/security/key-chain.lo \
@@ -166,7 +166,7 @@
ndn-cpp/transport/transport.lo \
ndn-cpp/transport/udp-transport.lo \
ndn-cpp/util/changed-event.lo \
- ndn-cpp/util/dynamic-uchar-vector.lo
+ ndn-cpp/util/dynamic-uchar-vector.lo ndn-cpp/util/logging.lo
libndn_cpp_la_OBJECTS = $(am_libndn_cpp_la_OBJECTS)
PROGRAMS = $(bin_PROGRAMS)
am_bin_test_encode_decode_data_OBJECTS = \
@@ -507,10 +507,10 @@
config.h \
ndn-cpp/common.hpp ndn-cpp/common.cpp \
ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
- ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
- ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/face.cpp ndn-cpp/face.hpp \
ndn-cpp/forwarding-entry.cpp ndn-cpp/c/forwarding-entry.h ndn-cpp/forwarding-entry.hpp \
+ ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
+ ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
ndn-cpp/node.cpp ndn-cpp/node.hpp \
ndn-cpp/publisher-public-key-digest.hpp \
@@ -532,6 +532,7 @@
ndn-cpp/util/blob.hpp \
ndn-cpp/util/changed-event.cpp ndn-cpp/util/changed-event.hpp \
ndn-cpp/util/dynamic-uchar-vector.cpp ndn-cpp/util/dynamic-uchar-vector.hpp \
+ ndn-cpp/util/logging.cpp ndn-cpp/util/logging.hpp \
ndn-cpp/util/signed-blob.hpp
bin_test_encode_decode_forwarding_entry_SOURCES = tests/test-encode-decode-forwarding-entry.cpp
@@ -719,14 +720,14 @@
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/data.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/interest.lo: ndn-cpp/$(am__dirstamp) \
- ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/key.lo: ndn-cpp/$(am__dirstamp) \
- ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/face.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/forwarding-entry.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/interest.lo: ndn-cpp/$(am__dirstamp) \
+ ndn-cpp/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/key.lo: ndn-cpp/$(am__dirstamp) \
+ ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/name.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/node.lo: ndn-cpp/$(am__dirstamp) \
@@ -789,6 +790,8 @@
ndn-cpp/util/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/util/dynamic-uchar-vector.lo: ndn-cpp/util/$(am__dirstamp) \
ndn-cpp/util/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/util/logging.lo: ndn-cpp/util/$(am__dirstamp) \
+ ndn-cpp/util/$(DEPDIR)/$(am__dirstamp)
libndn-cpp.la: $(libndn_cpp_la_OBJECTS) $(libndn_cpp_la_DEPENDENCIES) $(EXTRA_libndn_cpp_la_DEPENDENCIES)
$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libndn_cpp_la_OBJECTS) $(libndn_cpp_la_LIBADD) $(LIBS)
@@ -946,6 +949,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/udp-transport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/util/$(DEPDIR)/changed-event.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/util/$(DEPDIR)/dynamic-uchar-vector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/util/$(DEPDIR)/logging.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-data.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-forwarding-entry.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-interest.Po@am__quote@
diff --git a/ndn-cpp/util/logging.cpp b/ndn-cpp/util/logging.cpp
new file mode 100644
index 0000000..1ea8667
--- /dev/null
+++ b/ndn-cpp/util/logging.cpp
@@ -0,0 +1,47 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * @author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#include "logging.hpp"
+
+#ifdef HAVE_LOG4CXX
+
+#include <log4cxx/logger.h>
+#include <log4cxx/basicconfigurator.h>
+#include <log4cxx/consoleappender.h>
+#include <log4cxx/patternlayout.h>
+#include <log4cxx/level.h>
+#include <log4cxx/propertyconfigurator.h>
+#include <log4cxx/defaultconfigurator.h>
+#include <log4cxx/helpers/exception.h>
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+
+#include <unistd.h>
+
+void
+INIT_LOGGERS ()
+{
+ static bool configured = false;
+
+ if (configured) return;
+
+ if (access ("log4cxx.properties", R_OK)==0)
+ PropertyConfigurator::configureAndWatch ("log4cxx.properties");
+ else
+ {
+ PatternLayoutPtr layout (new PatternLayout ("%d{HH:mm:ss} %p %c{1} - %m%n"));
+ ConsoleAppenderPtr appender (new ConsoleAppender (layout));
+
+ BasicConfigurator::configure( appender );
+ Logger::getRootLogger()->setLevel (log4cxx::Level::getInfo ());
+ }
+
+ configured = true;
+}
+
+#endif
diff --git a/ndn-cpp/util/logging.hpp b/ndn-cpp/util/logging.hpp
new file mode 100644
index 0000000..84ad405
--- /dev/null
+++ b/ndn-cpp/util/logging.hpp
@@ -0,0 +1,79 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * @author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#ifndef NDN_LOGGING_HPP
+#define NDN_LOGGING_HPP
+
+#include "../../config.h"
+
+#ifdef HAVE_LOG4CXX
+
+#include <log4cxx/logger.h>
+
+#define MEMBER_LOGGER \
+ static log4cxx::LoggerPtr staticModuleLogger;
+
+#define INIT_MEMBER_LOGGER(className,name) \
+ log4cxx::LoggerPtr className::staticModuleLogger = log4cxx::Logger::getLogger (name);
+
+#define INIT_LOGGER(name) \
+ static log4cxx::LoggerPtr staticModuleLogger = log4cxx::Logger::getLogger (name);
+
+#define _LOG_DEBUG(x) \
+ LOG4CXX_DEBUG(staticModuleLogger, x);
+
+#define _LOG_TRACE(x) \
+ LOG4CXX_TRACE(staticModuleLogger, x);
+
+#define _LOG_FUNCTION(x) \
+ LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "(" << x << ")");
+
+#define _LOG_FUNCTION_NOARGS \
+ LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "()");
+
+#define _LOG_ERROR(x) \
+ LOG4CXX_ERROR(staticModuleLogger, x);
+
+#define _LOG_ERROR_COND(cond,x) \
+ if (cond) { _LOG_ERROR(x) }
+
+#define _LOG_DEBUG_COND(cond,x) \
+ if (cond) { _LOG_DEBUG(x) }
+
+void
+INIT_LOGGERS ();
+
+#else // else HAVE_LOG4CXX
+
+#define INIT_LOGGER(name)
+#define _LOG_FUNCTION(x)
+#define _LOG_FUNCTION_NOARGS
+#define _LOG_TRACE(x)
+#define INIT_LOGGERS(x)
+#define _LOG_ERROR(x)
+#define _LOG_ERROR_COND(cond,x)
+#define _LOG_DEBUG_COND(cond,x)
+
+#define MEMBER_LOGGER
+#define INIT_MEMBER_LOGGER(className,name)
+
+#ifdef _DEBUG
+
+#include <sys/time.h>
+#include <iostream>
+
+#define _LOG_DEBUG(x) \
+ { time_t now = time(0); std::string s = std::string(ctime(&now)); std::clog << s.substr(0, s.size() - 1) << " " << x << std::endl; }
+
+#else
+#define _LOG_DEBUG(x)
+#endif
+
+#endif // HAVE_LOG4CXX
+
+#endif