Pull request #3272: stream: Remove preemptive prunes peg count

Merge in SNORT/snort3 from ~MASHASAN/snort3:preemptive_pegcount to master

Squashed commit of the following:

commit 4e5e78eab8e4cd06d0452e4e757e67913f4972f8
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Feb 14 22:24:40 2022 -0500

    stream: Remove preemptive prunes peg count

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 2462dbf005ba252702d600ccb1e96435498ede25..b6e7f5018d58d8d18df2e0ad872ab7f9097d2a98 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -60,7 +60,6 @@ const PegInfo base_pegs[] =
     { CountType::SUM, "idle_prunes", " sessions pruned due to timeout" },
     { CountType::SUM, "excess_prunes", "sessions pruned due to excess" },
     { CountType::SUM, "uni_prunes", "uni sessions pruned" },
-    { CountType::SUM, "preemptive_prunes", "sessions pruned during preemptive pruning (deprecated)" },
     { CountType::SUM, "memcap_prunes", "sessions pruned due to memcap" },
     { CountType::SUM, "ha_prunes", "sessions pruned by high availability sync" },
     { CountType::SUM, "stale_prunes", "sessions pruned due to stale connection" },
@@ -90,7 +89,6 @@ void base_prep()
     stream_base_stats.timeout_prunes = flow_con->get_prunes(PruneReason::IDLE);
     stream_base_stats.excess_prunes = flow_con->get_prunes(PruneReason::EXCESS);
     stream_base_stats.uni_prunes = flow_con->get_prunes(PruneReason::UNI);
-    stream_base_stats.preemptive_prunes = flow_con->get_prunes(PruneReason::MEMCAP);
     stream_base_stats.memcap_prunes = flow_con->get_prunes(PruneReason::MEMCAP);
     stream_base_stats.ha_prunes = flow_con->get_prunes(PruneReason::HA);
     stream_base_stats.stale_prunes = flow_con->get_prunes(PruneReason::STALE);

diff --git a/src/stream/base/stream_module.h b/src/stream/base/stream_module.h
index 828d67f81406f9aee984d48bfdda91a588e2308e..7b827e2e58f0c7e1e7f85875b8e68de7e63702b1 100644 (file)
--- a/src/stream/base/stream_module.h
+++ b/src/stream/base/stream_module.h
@@ -59,7 +59,6 @@ struct BaseStats
      PegCount timeout_prunes;
      PegCount excess_prunes;
      PegCount uni_prunes;
-     PegCount preemptive_prunes;
      PegCount memcap_prunes;
      PegCount ha_prunes;
      PegCount stale_prunes;