Added global (heap) memory stats for daemon status events.

 * added new CMake option `ENABLE_MEMORY_STATUS` to restore the old behavior
   (and increase performance)
 * splitted `ENABLE_MEMORY_PROFILING` into `ENABLE_MEMORY_STATUS` and `ENABLE_MEMORY_PROFILING`

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

1 files changed, 34 insertions, 5 deletions

diff --git a/nDPId.c b/nDPId.c
index bb7b1d4ec..4ae87dca9 100644
--- a/nDPId.c
+++ b/nDPId.c
@@ -73,6 +73,10 @@
 #error "Invalid value for nDPId_PACKETS_PLEN_MAX"
 #endif
 
+#if defined(ENABLE_MEMORY_PROFILING) && !defined(ENABLE_MEMORY_STATUS)
+#error "ENABLE_MEMORY_PROFILING requires ENABLE_MEMORY_STATUS to make it work!"
+#endif
+
 /* MIPS* does not support Compare and Swap. Use traditional locking as fallback. */
 #if !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
 #define MT_VALUE(name, type)                                                                                           \
@@ -440,7 +444,7 @@ static struct nDPIsrvd_address collector_address;
 static MT_VALUE(nDPId_main_thread_shutdown, int) = MT_INIT(0);
 static MT_VALUE(global_flow_id, uint64_t) = MT_INIT(1);
 
-#ifdef ENABLE_MEMORY_PROFILING
+#ifdef ENABLE_MEMORY_STATUS
 static MT_VALUE(ndpi_memory_alloc_count, uint64_t) = MT_INIT(0);
 static MT_VALUE(ndpi_memory_alloc_bytes, uint64_t) = MT_INIT(0);
 static MT_VALUE(ndpi_memory_free_count, uint64_t) = MT_INIT(0);
@@ -704,7 +708,7 @@ static int zlib_deflate(const void * const src, int srcLen, void * dst, int dstL
         if (err == Z_STREAM_END)
         {
             ret = strm.total_out;
-#ifdef ENABLE_MEMORY_PROFILING
+#ifdef ENABLE_MEMORY_STATUS
             MT_GET_AND_ADD(zlib_compressions, 1);
             MT_GET_AND_ADD(zlib_compression_diff, srcLen - ret);
             MT_GET_AND_ADD(zlib_compression_bytes, ret);
@@ -748,7 +752,7 @@ static int zlib_inflate(const void * src, int srcLen, void * dst, int dstLen)
         if (err == Z_STREAM_END)
         {
             ret = strm.total_out;
-#ifdef ENABLE_MEMORY_PROFILING
+#ifdef ENABLE_MEMORY_STATUS
             MT_GET_AND_ADD(zlib_decompressions, 1);
             MT_GET_AND_SUB(zlib_compression_diff, ret - srcLen);
 #endif
@@ -1074,7 +1078,7 @@ static int get_ip_netmask_from_pcap_dev(char const * const pcap_dev)
     return retval;
 }
 
-#ifdef ENABLE_MEMORY_PROFILING
+#ifdef ENABLE_MEMORY_STATUS
 static void * ndpi_malloc_wrapper(size_t const size)
 {
     void * p = malloc(sizeof(uint64_t) + size);
@@ -1100,7 +1104,9 @@ static void ndpi_free_wrapper(void * const freeable)
 
     free(p);
 }
+#endif
 
+#ifdef ENABLE_MEMORY_PROFILING
 static void log_memory_usage(struct nDPId_reader_thread const * const reader_thread)
 {
     if (reader_thread->array_index == 0)
@@ -1231,7 +1237,7 @@ static struct nDPId_workflow * init_workflow(char const * const file_or_device)
     char pcap_error_buffer[PCAP_ERRBUF_SIZE];
     struct nDPId_workflow * workflow;
 
-#ifdef ENABLE_MEMORY_PROFILING
+#ifdef ENABLE_MEMORY_STATUS
     set_ndpi_malloc(ndpi_malloc_wrapper);
     set_ndpi_free(ndpi_free_wrapper);
     set_ndpi_flow_malloc(NULL);
@@ -2161,6 +2167,29 @@ static void jsonize_daemon(struct nDPId_reader_thread * const reader_thread, enu
             ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "total-compression-diff", 0);
             ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "current-compression-diff", 0);
 #endif
+#if defined(ENABLE_MEMORY_STATUS) && !defined(NO_MAIN)
+            /*
+             * Global memory stats may very from run to run.
+             * Due to this, `nDPId-test' results would be inconsistent and is disabled if NO_MAIN defined.
+             */
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer,
+                                         "global-alloc-count",
+                                         MT_GET_AND_ADD(ndpi_memory_alloc_count, 0));
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer,
+                                         "global-free-count",
+                                         MT_GET_AND_ADD(ndpi_memory_free_count, 0));
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer,
+                                         "global-alloc-bytes",
+                                         MT_GET_AND_ADD(ndpi_memory_alloc_bytes, 0));
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer,
+                                         "global-free-bytes",
+                                         MT_GET_AND_ADD(ndpi_memory_free_bytes, 0));
+#else
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "global-alloc-count", 0);
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "global-free-count", 0);
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "global-alloc-bytes", 0);
+            ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "global-free-bytes", 0);
+#endif
             ndpi_serialize_string_uint64(&workflow->ndpi_serializer,
                                          "total-events-serialized",
                                          workflow->total_events_serialized +