From: Michael Matirko (mmatirko) <mmatirko@cisco.com>
Date: Fri, 29 Sep 2023 16:21:30 +0000 (+0000)
Subject: Pull request #4030: memory: change NOW type counts to SUM type, where necessary
X-Git-Tag: 3.1.72.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0479739b78ef1707af82f41291c043bf37b61147;p=thirdparty%2Fsnort3.git

Pull request #4030: memory: change NOW type counts to SUM type, where necessary

Merge in SNORT/snort3 from ~MMATIRKO/snort3:now_pegs to master

Squashed commit of the following:

commit 82c5c10e13933d003f8907a41c8bdee48541a381
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Sep 27 15:27:54 2023 -0400

    memory: change NOW type counts to SUM type, where necessary
---

diff --git a/src/memory/memory_module.cc b/src/memory/memory_module.cc
index e25f12e66..f13d8818f 100644
--- a/src/memory/memory_module.cc
+++ b/src/memory/memory_module.cc
@@ -64,15 +64,15 @@ const PegInfo mem_pegs[] =
     { CountType::NOW, "start_up_use", "memory used before packet processing" },
     { CountType::NOW, "cur_in_use", "current memory used" },
     { CountType::MAX, "max_in_use", "maximum memory used" },
-    { CountType::NOW, "epochs", "number of memory updates" },
+    { CountType::SUM, "epochs", "number of memory updates" },
     { CountType::NOW, "allocated", "total amount of memory allocated by packet threads" },
     { CountType::NOW, "deallocated", "total amount of memory deallocated by packet threads" },
-    { CountType::NOW, "reap_cycles", "number of actionable over-limit conditions" },
-    { CountType::NOW, "reap_attempts", "attempts to reclaim memory" },
-    { CountType::NOW, "reap_failures", "failures to reclaim memory" },
-    { CountType::NOW, "reap_aborts", "abort pruning before target due to process under limit" },
-    { CountType::NOW, "reap_decrease", "total amount of the decrease in thread memory while process over limit" },
-    { CountType::NOW, "reap_increase", "total amount of the increase in thread memory while process over limit" },
+    { CountType::SUM, "reap_cycles", "number of actionable over-limit conditions" },
+    { CountType::SUM, "reap_attempts", "attempts to reclaim memory" },
+    { CountType::SUM, "reap_failures", "failures to reclaim memory" },
+    { CountType::SUM, "reap_aborts", "abort pruning before target due to process under limit" },
+    { CountType::SUM, "reap_decrease", "total amount of the decrease in thread memory while process over limit" },
+    { CountType::SUM, "reap_increase", "total amount of the increase in thread memory while process over limit" },
     { CountType::NOW, "app_all", "total bytes allocated by application" },
     { CountType::NOW, "active", "total bytes allocated in active pages" },
     { CountType::NOW, "resident", "maximum bytes physically resident" },