Merge pull request #2159 in SNORT/snort3 from ~PSREENAT/snort3:CSCvs97794 to master

Squashed commit of the following:

commit ea62e068b25994685594f58da709c4589064500d
Author: Prajwal Srinivas Sreenath <psreenat@cisco.com>
Date:   Tue Apr 14 05:00:22 2020 -0400

    stream: Fix for stream pegs dumping zero values into perf_monitor_base.csv

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 5c863e7db994f68b760cef83a0300b352686f4de..889a0bb69f6fec023464185729ec4c69c288db83 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -78,7 +78,7 @@ const PegInfo base_pegs[] =
 };
 
 // FIXIT-L dependency on stats define in another file
-void base_sum()
+void base_prep()
 {
     if ( !flow_con )
         return;
@@ -105,7 +105,10 @@ void base_sum()
         stream_base_stats.expected_pruned = exp_cache->get_prunes();
         stream_base_stats.expected_overflows = exp_cache->get_overflows();
     }
+}
 
+void base_sum()
+{
     sum_stats((PegCount*)&g_stats, (PegCount*)&stream_base_stats,
         array_size(base_pegs) - 1);
     base_reset();

diff --git a/src/stream/base/stream_module.cc b/src/stream/base/stream_module.cc
index 1f30fdac40aed09fc0a102db34b8dd44461c6dce..ecd7850b81b96b973b6eb1fec3473f49591d1c36 100644 (file)
--- a/src/stream/base/stream_module.cc
+++ b/src/stream/base/stream_module.cc
@@ -192,6 +192,9 @@ bool StreamModule::end(const char*, int, SnortConfig* sc)
     return true;
 }
 
+void StreamModule::prep_counts()
+{ base_prep(); }
+
 void StreamModule::sum_stats(bool)
 { base_sum(); }
 

diff --git a/src/stream/base/stream_module.h b/src/stream/base/stream_module.h
index 2e09796813da1904595fdddf36d083171b5b4091..016d37d00750bc4b70367abfbd019be8c4e3e956 100644 (file)
--- a/src/stream/base/stream_module.h
+++ b/src/stream/base/stream_module.h
@@ -117,10 +117,14 @@ public:
     unsigned get_gid() const override;
     const snort::RuleMap* get_rules() const override;
 
+    void prep_counts() override;
     void sum_stats(bool) override;
     void show_stats() override;
     void reset_stats() override;
 
+    bool counts_need_prep() const override
+    { return true; }
+
     Usage get_usage() const override
     { return GLOBAL; }
 
@@ -129,6 +133,7 @@ private:
     StreamReloadResourceManager reload_resource_manager;
 };
 
+extern void base_prep();
 extern void base_sum();
 extern void base_stats();
 extern void base_reset();