Merge pull request #2753 in SNORT/snort3 from ~ARMANDAV/snort3:oomkill to master

Squashed commit of the following:

commit 41f16cfa0a59259aabc849b50ac39b16868fed88
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Feb 11 20:50:55 2021 -0500

    memory: free memory space while updating allocation

diff --git a/src/flow/flow_data.cc b/src/flow/flow_data.cc
index 470675aed62d4c0aafff2a4815305774c0c4c06c..2caa19aa2e51735c39e4f6855b9690a2631b0f61 100644 (file)
--- a/src/flow/flow_data.cc
+++ b/src/flow/flow_data.cc
@@ -54,7 +54,6 @@ FlowData::~FlowData()
 
 void FlowData::update_allocations(size_t n)
 {
-    memory::MemoryCap::free_space(n);
     memory::MemoryCap::update_allocations(n);
     mem_in_use += n;
 }

diff --git a/src/memory/memory_cap.cc b/src/memory/memory_cap.cc
index 89737f099f4b1e5414071b6cc3c8bdf2fa2ea3dd..86c16ef9d0835c8bb8de2cff2651c6d3fb4be6f4 100644 (file)
--- a/src/memory/memory_cap.cc
+++ b/src/memory/memory_cap.cc
@@ -157,6 +157,7 @@ void MemoryCap::update_allocations(size_t n)
 
     size_t k = n;
     n = fudge_it(n);
+    free_space(n);
     mem_stats.total_fudge += (n - k);
     s_tracker.allocate(n);
     auto in_use = s_tracker.used();