Merge pull request #2890 in SNORT/snort3 from ~MDAGON/snort3:memory to master

Squashed commit of the following:

commit 506959d13ea92852540f493e0d3818ed3977e6e4
Author: Maya Dagon <mdagon@cisco.com>
Date:   Mon May 17 13:15:59 2021 -0400

    memory: free_space cleanup

diff --git a/src/flow/test/flow_test.cc b/src/flow/test/flow_test.cc
index 17e87e95db7918830ec1d21f25bfb8f67b499a10..f33049567494c6ffb364779d87a08c535fb0c369 100644 (file)
--- a/src/flow/test/flow_test.cc
+++ b/src/flow/test/flow_test.cc
@@ -51,7 +51,7 @@ void memory::MemoryCap::update_allocations(size_t) {}
 
 void memory::MemoryCap::update_deallocations(size_t) {}
 
-bool memory::MemoryCap::free_space(size_t) { return false; }
+void memory::MemoryCap::free_space(size_t) { }
 
 bool HighAvailabilityManager::active() { return false; }
 

diff --git a/src/memory/memory_cap.cc b/src/memory/memory_cap.cc
index f2f91cb7150469aa306ab85f73233b15e2bc6ce7..49d71751fc215822e46886fccda8b33029238f41 100644 (file)
--- a/src/memory/memory_cap.cc
+++ b/src/memory/memory_cap.cc
@@ -124,25 +124,22 @@ size_t MemoryCap::preemptive_threshold = 0;
 // public interface
 // -----------------------------------------------------------------------------
 
-bool MemoryCap::free_space(size_t n)
+void MemoryCap::free_space(size_t n)
 {
     if ( !is_packet_thread() )
-        return true;
+        return;
 
     if ( !thread_cap )
-        return true;
+        return;
 
     static THREAD_LOCAL bool entered = false;
-    assert(!entered);
-
+    
     if ( entered )
-        return false;
+        return;
 
     entered = true;
-    bool avail = memory::free_space(n, thread_cap, s_tracker, prune_handler);
+    memory::free_space(n, thread_cap, s_tracker, prune_handler);
     entered = false;
-
-    return avail;
 }
 
 static size_t fudge_it(size_t n)

diff --git a/src/memory/memory_cap.h b/src/memory/memory_cap.h
index 8a170e3769e6a2d7b507692dd1d0f99f8072dc38..b28bb47e70fb6b17136ad14806769393a1e46473 100644 (file)
--- a/src/memory/memory_cap.h
+++ b/src/memory/memory_cap.h
@@ -31,7 +31,7 @@ namespace memory
 class SO_PUBLIC MemoryCap
 {
 public:
-    static bool free_space(size_t);
+    static void free_space(size_t);
     // The following functions perform internal rounding. Allocations and deallocations must be
     // performed in identical increments or leakage may occur.
     static void update_allocations(size_t);