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>

4 files changed, 4 insertions, 4 deletions

diff --git a/test/results/influxd/disable_protocols/dns_long_domainname.pcap.out b/test/results/influxd/disable_protocols/dns_long_domainname.pcap.out
index 271387658..8123ba431 100644
--- a/test/results/influxd/disable_protocols/dns_long_domainname.pcap.out
+++ b/test/results/influxd/disable_protocols/dns_long_domainname.pcap.out
@@ -1,4 +1,4 @@
-general json_lines=9,json_bytes=7489,flow_src_total_bytes=61,flow_dst_total_bytes=117
+general json_lines=9,json_bytes=7669,flow_src_total_bytes=61,flow_dst_total_bytes=117
 events flow_new_count=1,flow_end_count=0,flow_idle_count=1,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=0,flow_detected_count=1,flow_detection_update_count=1,flow_not_detected_count=0,flow_risky_count=1,packet_count=0,packet_flow_count=2,init_count=1,reconnect_count=0,shutdown_count=1,status_count=1,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=0,flow_state_finished=1
 breed flow_breed_safe_count=0,flow_breed_acceptable_count=1,flow_breed_fun_count=0,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
diff --git a/test/results/influxd/disable_protocols/pluralsight.pcap.out b/test/results/influxd/disable_protocols/pluralsight.pcap.out
index d87e2de5c..cb397b80a 100644
--- a/test/results/influxd/disable_protocols/pluralsight.pcap.out
+++ b/test/results/influxd/disable_protocols/pluralsight.pcap.out
@@ -1,4 +1,4 @@
-general json_lines=59,json_bytes=73931,flow_src_total_bytes=3540,flow_dst_total_bytes=23176
+general json_lines=59,json_bytes=74111,flow_src_total_bytes=3540,flow_dst_total_bytes=23176
 events flow_new_count=6,flow_end_count=0,flow_idle_count=6,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=0,flow_detected_count=6,flow_detection_update_count=10,flow_not_detected_count=0,flow_risky_count=0,packet_count=0,packet_flow_count=28,init_count=1,reconnect_count=0,shutdown_count=1,status_count=1,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=6,flow_state_finished=0
 breed flow_breed_safe_count=0,flow_breed_acceptable_count=0,flow_breed_fun_count=6,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
diff --git a/test/results/influxd/disable_protocols/quic-mvfst-27.pcapng.out b/test/results/influxd/disable_protocols/quic-mvfst-27.pcapng.out
index bce13a51e..225748fab 100644
--- a/test/results/influxd/disable_protocols/quic-mvfst-27.pcapng.out
+++ b/test/results/influxd/disable_protocols/quic-mvfst-27.pcapng.out
@@ -1,4 +1,4 @@
-general json_lines=10,json_bytes=15676,flow_src_total_bytes=2538,flow_dst_total_bytes=6981
+general json_lines=10,json_bytes=15766,flow_src_total_bytes=2538,flow_dst_total_bytes=6981
 events flow_new_count=1,flow_end_count=0,flow_idle_count=1,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=0,flow_detected_count=1,flow_detection_update_count=0,flow_not_detected_count=0,flow_risky_count=0,packet_count=0,packet_flow_count=5,init_count=1,reconnect_count=0,shutdown_count=1,status_count=0,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=0,flow_state_finished=1
 breed flow_breed_safe_count=0,flow_breed_acceptable_count=0,flow_breed_fun_count=1,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
diff --git a/test/results/influxd/disable_protocols/soap.pcap.out b/test/results/influxd/disable_protocols/soap.pcap.out
index 858d0e71f..f731bfd78 100644
--- a/test/results/influxd/disable_protocols/soap.pcap.out
+++ b/test/results/influxd/disable_protocols/soap.pcap.out
@@ -1,4 +1,4 @@
-general json_lines=24,json_bytes=27804,flow_src_total_bytes=8109,flow_dst_total_bytes=1637
+general json_lines=24,json_bytes=28074,flow_src_total_bytes=8109,flow_dst_total_bytes=1637
 events flow_new_count=3,flow_end_count=1,flow_idle_count=2,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=1,flow_detected_count=2,flow_detection_update_count=0,flow_not_detected_count=0,flow_risky_count=1,packet_count=0,packet_flow_count=11,init_count=1,reconnect_count=0,shutdown_count=1,status_count=2,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=2,flow_state_finished=1
 breed flow_breed_safe_count=0,flow_breed_acceptable_count=2,flow_breed_fun_count=0,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0