From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Tue, 22 Feb 2022 17:51:16 +0000 (+0000)
Subject: Pull request #3272: stream: Remove preemptive prunes peg count
X-Git-Tag: 3.1.24.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1fe894f0c0599cc7418989abdfae42c579ddde4;p=thirdparty%2Fsnort3.git

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 2462dbf00..b6e7f5018 100644
--- 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 828d67f81..7b827e2e5 100644
--- 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;