Added gprof CPU/HEAP profiling support. (#1592)

* Some small auto{conf,make} improvements

Signed-off-by: lns <matzeton@googlemail.com>

8 files changed, 25 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index f17538883..0bde360ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,7 @@ AS_IF([test "${with_only_libndpi+set}" = set],[
 
 AC_ARG_WITH(sanitizer,     AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer]))
 AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no])
+AC_ARG_ENABLE(gprof, AS_HELP_STRING([--enable-gprof], [Enable CPU/HEAP profiling with gperftools]),[enable_gprof=$enableval],[enable_gprof=no])
 AC_ARG_ENABLE(code-coverage, AS_HELP_STRING([--enable-code-coverage], [Generate Code Coverage report]))
 AC_ARG_WITH(local-libgcrypt,  AS_HELP_STRING([--with-local-libgcrypt], [Build with libgcrypt (if present) instead of the enclosed gcrypt light]))
 AC_ARG_ENABLE(tls-sigs, AS_HELP_STRING([--enable-tls-sigs], [Enable TLS Client signature algorithm dissection. Rarely used, but requires significantly more memory.]))
@@ -26,7 +27,7 @@ AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"])
 AS_IF([test "${with_sanitizer+set}" = set],[
   CFLAGS="${CFLAGS} -g3 -O0 -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer"
   LDFLAGS="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak"
-])
+],[CFLAGS="${CFLAGS} -g"])
 
 AS_IF([test "x${enable_code_coverage}" = "xyes"],[
   CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
@@ -128,8 +129,7 @@ AS_IF([test "x${enable_tls_sigs}" = "xyes"],[
   HANDLE_TLS_SIGS=""
 ])
 
-LIBS="$LIBS $JSONC_LIBS"
-CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member $CFLAGS $JSONC_CFLAGS"
+CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member ${CFLAGS}"
 
 AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h unistd.h math.h float.h])
 AC_CHECK_LIB([m], [sqrt], [], [LIBM="-lm"])
@@ -262,6 +262,17 @@ return 0;
 ])
 AM_CONDITIONAL([HAS_FUZZLDFLAGS], [test "x$has_sanitizefuzzer" = "xyes"])
 
+AS_IF([test "x$enable_gprof" = "xyes"], [
+    PKG_CHECK_MODULES([PROFILER], [libprofiler],,[
+        AC_MSG_ERROR([libprofiler not available. Required for profiling support.])
+    ])
+    PKG_CHECK_MODULES([TCMALLOC], [libtcmalloc],,[
+        AC_MSG_ERROR([libtcmalloc not available. Required for profiling support.])
+    ])
+    GPROF_LIBS="${pkg_cv_PROFILER_LIBS} ${pkg_cv_TCMALLOC_LIBS}"
+    GPROF_CFLAGS="${pkg_cv_PROFILER_CFLAGS} ${pkg_cv_TCMALLOC_CFLAGS}"
+])
+
 AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np]))
 
 dnl> libgcrypt (external)
@@ -328,6 +339,8 @@ AC_SUBST(BUILD_MINGW_X64)
 AC_SUBST(BUILD_FUZZTARGETS)
 AC_SUBST(JSONC_CFLAGS)
 AC_SUBST(JSONC_LIBS)
+AC_SUBST(GPROF_CFLAGS)
+AC_SUBST(GPROF_LIBS)
 AC_SUBST(USE_HOST_LIBGCRYPT)
 AC_SUBST(PCRE_ENABLED)
 AC_SUBST(HANDLE_TLS_SIGS)
diff --git a/example/Makefile.in b/example/Makefile.in
index 355c917e3..f8f68efa7 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -9,10 +9,10 @@ SRCHOME=../src
 ifneq ($(OS),Windows_NT)
 CFLAGS+=-fPIC -DPIC
 endif
-CFLAGS+=-g -I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@
+CFLAGS+=-I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBNDPI=$(SRCHOME)/lib/libndpi.a
-LIBS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@
+LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
 HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \
         $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
 PREFIX?=@prefix@
diff --git a/influxdb/Makefile.in b/influxdb/Makefile.in
index e5378b25a..14113476b 100644
--- a/influxdb/Makefile.in
+++ b/influxdb/Makefile.in
@@ -2,7 +2,7 @@ CC=@CC@
 INC=-I ../src/include -I/usr/local/include
 LIBDPI=../src/lib/libndpi.a
 LDFLAGS=@LDFLAGS@
-LIB=$(LIBDPI) -lrrd -lm @LIBS@ @ADDITIONAL_LIBS@
+LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBS@
 
 TOOLS=metric_anomaly
 
diff --git a/rrdtool/Makefile.in b/rrdtool/Makefile.in
index 228d28eff..55f0d6a10 100644
--- a/rrdtool/Makefile.in
+++ b/rrdtool/Makefile.in
@@ -2,7 +2,7 @@ CC=@CC@
 INC=-I ../src/include -I/usr/local/include
 LIBDPI=../src/lib/libndpi.a
 LDFLAGS=@LDFLAGS@
-LIB=$(LIBDPI) -lrrd -lm @LIBS@ @ADDITIONAL_LIBS@ @LIBRRD@
+LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBRRD@ @LIBS@
 
 TOOLS=rrd_anomaly rrd_similarity
 
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index c7cc22283..2c1894a91 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -17,9 +17,9 @@ includedir = ${prefix}/include/ndpi
 ifneq ($(OS),Windows_NT)
 CFLAGS     += -fPIC -DPIC
 endif
-CFLAGS     += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @CFLAGS@ @CUSTOM_NDPI@
+CFLAGS     += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@
 LDFLAGS    = @LDFLAGS@
-LIBS       = @ADDITIONAL_LIBS@ @LIBS@
+LIBS       = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
 
 OBJECTS   = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
 HEADERS   = $(wildcard ../include/*.h)
diff --git a/tests/dga/Makefile.in b/tests/dga/Makefile.in
index 4bd6711bc..52fdea113 100644
--- a/tests/dga/Makefile.in
+++ b/tests/dga/Makefile.in
@@ -9,7 +9,7 @@ CFLAGS+=-fPIC -DPIC
 endif
 CFLAGS+=-g -I$(SRCHOME)/include @CFLAGS@
 LIBNDPI=$(SRCHOME)/lib/libndpi.a
-LIBS=$(LIBNDPI) @LIBS@ @ADDITIONAL_LIBS@ -lpthread
+LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@
 LDFLAGS=@LDFLAGS@
 HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
 OBJS=dga_evaluate
diff --git a/tests/performance/Makefile.in b/tests/performance/Makefile.in
index 28f3dbc72..54c5e9fd9 100644
--- a/tests/performance/Makefile.in
+++ b/tests/performance/Makefile.in
@@ -1,5 +1,5 @@
 INC=-I ../../src/include/ -I ../../src/lib/third_party/include/
-LIB=../../src/lib/libndpi.a @ADDITIONAL_LIBS@
+LIB=../../src/lib/libndpi.a @ADDITIONAL_LIBS@ @LIBS@
 
 TOOLS=substringsearch patriciasearch gcrypt-int gcrypt-gnu
 TESTS=substring_test patricia_test
diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
index 36f8bec3e..9185c9031 100644
--- a/tests/unit/Makefile.in
+++ b/tests/unit/Makefile.in
@@ -10,7 +10,7 @@ CFLAGS+=-fPIC -DPIC
 endif
 CFLAGS+=-g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
 LIBNDPI=$(SRCHOME)/lib/libndpi.a
-LIBS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread
+LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@
 LDFLAGS=@LDFLAGS@
 HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
 OBJS=unit