Add file capture stats

diff --git a/src/file_api/file_capture.cc b/src/file_api/file_capture.cc
index 66712bce74e25322544f05080752b3f59095ad7a..d9b09cceda329e58adf2103c6c978318c1df737b 100644 (file)
--- a/src/file_api/file_capture.cc
+++ b/src/file_api/file_capture.cc
@@ -42,6 +42,7 @@
 #include "main/snort_config.h"
 #include "hash/hashes.h"
 #include "utils/util.h"
+#include "utils/stats.h"
 
 FileMemPool* file_mempool = nullptr;
 File_Capture_Stats file_capture_stats;
@@ -173,7 +174,7 @@ inline FileCaptureState FileCapture::save_to_file_buffer(FileMemPool* file_mempo
     if ( data_size + (int64_t)file_size > max_size)
     {
         FILE_DEBUG_MSGS("Exceeding max file capture size!\n");
-        file_capture_stats.file_size_exceeded++;
+        file_capture_stats.file_size_max++;
         capture_state = FILE_CAPTURE_MAX;
         return FILE_CAPTURE_MAX;
     }
@@ -524,14 +525,10 @@ void FileCapture::print_mem_usage(void)
 {
     if (file_mempool)
     {
-        LogMessage("Maximum buffers can allocate:      " FMTu64("-10") " \n",
-            file_mempool->total);
-        LogMessage("Number of buffers in use:          " FMTu64("-10") " \n",
-            file_mempool_allocated(file_mempool));
-        LogMessage("Number of buffers in free list:    " FMTu64("-10") " \n",
-            file_mempool_freed(file_mempool));
-        LogMessage("Number of buffers in release list: " FMTu64("-10") " \n",
-            file_mempool_released(file_mempool));
+        LogCount("Max buffers can allocate", file_mempool->total);
+        LogCount("Buffers in use", file_mempool_allocated(file_mempool));
+        LogCount("Buffers in free list", file_mempool_freed(file_mempool));
+        LogCount("Buffers in release list", file_mempool_released(file_mempool));
     }
 }
 

diff --git a/src/file_api/file_capture.h b/src/file_api/file_capture.h
index c0c7f1a62913a692bbf63e90d12d85f4bee80fd4..53c798a906ba7f467045f8677916c715e03d1d3d 100644 (file)
--- a/src/file_api/file_capture.h
+++ b/src/file_api/file_capture.h
@@ -113,7 +113,6 @@ typedef struct _File_Capture_Stats
     uint64_t file_memcap_failures_total;
     uint64_t file_memcap_failures_reserve; /*This happens during reserve*/
     uint64_t file_reserve_failures;        /*This happens during reserve*/
-    uint64_t file_size_exceeded;
     uint64_t file_size_min;                /*This happens during reserve*/
     uint64_t file_size_max;                /*This happens during reserve*/
     uint64_t file_within_packet;

diff --git a/src/file_api/file_stats.cc b/src/file_api/file_stats.cc
index 5964f4bfdcc5c75b23621d980379769be44153ae..84e52906f927556f185c562655d9fc1560afe3f4 100644 (file)
--- a/src/file_api/file_stats.cc
+++ b/src/file_api/file_stats.cc
@@ -252,49 +252,35 @@ void print_file_stats()
         }
     }
 
-    LogMessage("\n");
-    LogMessage("Total files processed:             " FMTu64("-10") " \n", file_stats.files_total);
-    LogMessage("Total files data processed:        " FMTu64(
-            "-10") "bytes \n", file_stats.file_data_total);
-    LogMessage("Total files buffered:              " FMTu64(
-            "-10") " \n", file_capture_stats.files_buffered_total);
-    LogMessage("Total files released:              " FMTu64(
-            "-10") " \n", file_capture_stats.files_released_total);
-    LogMessage("Total files freed:                 " FMTu64(
-            "-10") " \n", file_capture_stats.files_freed_total);
-    LogMessage("Total files captured:              " FMTu64(
-            "-10") " \n", file_capture_stats.files_captured_total);
-    LogMessage("Total files within one packet:     " FMTu64(
-            "-10") " \n", file_capture_stats.file_within_packet);
-    LogMessage("Total buffers allocated:           " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_allocated_total);
-    LogMessage("Total buffers freed:               " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_freed_total);
-    LogMessage("Total buffers released:            " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_released_total);
-    LogMessage("Maximum file buffers used:         " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_used_max);
-    LogMessage("Total buffers free errors:         " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_free_errors);
-    LogMessage("Total buffers release errors:      " FMTu64(
-            "-10") " \n", file_capture_stats.file_buffers_release_errors);
-    LogMessage("Total memcap failures:             " FMTu64(
-            "-10") " \n", file_capture_stats.file_memcap_failures_total);
-    LogMessage("Total memcap failures at reserve:  " FMTu64(
-            "-10") " \n", file_capture_stats.file_memcap_failures_reserve);
-    LogMessage("Total reserve failures:            " FMTu64(
-            "-10") " \n", file_capture_stats.file_reserve_failures);
-    LogMessage("Total file capture size min:       " FMTu64(
-            "-10") " \n", file_capture_stats.file_size_min);
-    LogMessage("Total file capture size max:       " FMTu64(
-            "-10") " \n", file_capture_stats.file_size_max);
-    LogMessage("Total capture max before reserve:  " FMTu64(
-            "-10") " \n", file_capture_stats.file_size_exceeded);
-    LogMessage("Total file signature max:          " FMTu64(
-            "-10") " \n", file_stats.files_sig_depth);
-
-    FileCapture::print_mem_usage();
 #endif
 
+    if (file_capture_stats.files_buffered_total || file_capture_stats.file_within_packet)
+    {
+        LogLabel("file capture stats");
+        LogCount("Files buffered", file_capture_stats.files_buffered_total);
+        LogCount("Files released", file_capture_stats.files_released_total);
+        LogCount("Files freed", file_capture_stats.files_freed_total);
+        LogCount("Files captured", file_capture_stats.files_captured_total);
+        LogCount("Files within one packet", file_capture_stats.file_within_packet);
+        LogCount("Buffers allocated", file_capture_stats.file_buffers_allocated_total);
+        LogCount("Buffers freed", file_capture_stats.file_buffers_freed_total);
+        LogCount("Buffers released", file_capture_stats.file_buffers_released_total);
+        LogCount("Max file buffers used", file_capture_stats.file_buffers_used_max);
+        LogCount("Buffers free errors", file_capture_stats.file_buffers_free_errors);
+        LogCount("Buffers release errors", file_capture_stats.file_buffers_release_errors);
+        LogCount("Total memcap failures", file_capture_stats.file_memcap_failures_total);
+        LogCount("Memcap failures at reserve", file_capture_stats.file_memcap_failures_reserve);
+        LogCount("Reserve failures", file_capture_stats.file_reserve_failures);
+        LogCount("File capture size min", file_capture_stats.file_size_min);
+        LogCount("File capture size max", file_capture_stats.file_size_max);
+        LogCount("File signature max", file_stats.files_sig_depth);
+
+        FileCapture::print_mem_usage();
+    }
+
+    LogLabel("file stats summary");
+    LogCount("Files processed",file_stats.files_total);
+    LogCount("Files data processed", file_stats.file_data_total);
+
 }