From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Tue, 14 Dec 2021 19:40:36 +0000 (+0000)
Subject: Pull request #3210: perf_monitor: periodically update telemetry data during thread... 
X-Git-Tag: 3.1.19.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f177abd4758274be6749e2711c0e268a14271ec;p=thirdparty%2Fsnort3.git

Pull request #3210: perf_monitor: periodically update telemetry data during thread's idle mode

Merge in SNORT/snort3 from ~SVLASIUK/snort3:perf_mon to master

Squashed commit of the following:

commit 481156c654cf73ba797febd0608cd8fd9bd8cc8e
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Thu Dec 9 15:58:52 2021 +0200

    managers: continue inspectors probe when packet has disable_inspect flag
---

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 613747367..009cd538b 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -1411,7 +1411,7 @@ void InspectorManager::print_config(SnortConfig* sc)
 
 template<bool T>
 static inline void execute(
-    Packet* p, PHInstance* const * prep, unsigned num)
+    Packet* p, PHInstance* const * prep, unsigned num, bool probe = false)
 {
     Stopwatch<SnortClock> timer;
     for ( unsigned i = 0; i < num; ++i, ++prep )
@@ -1451,7 +1451,7 @@ static inline void execute(
                 "exit %s, elapsed time: %" PRId64" usec\n", inspector_name, TO_USECS(timer.get()));
 
         // must check between each ::execute()
-        if ( p->disable_inspect )
+        if ( !probe && p->disable_inspect )
             return;
     }
 }
@@ -1613,7 +1613,7 @@ void InspectorManager::probe(Packet* p)
     FrameworkPolicy* fp = policy->framework_policy;
 
     if ( !trace_enabled(snort_trace, TRACE_INSPECTOR_MANAGER, DEFAULT_TRACE_LOG_LEVEL, p) )
-        ::execute<false>(p, fp->probe.vec, fp->probe.num);
+        ::execute<false>(p, fp->probe.vec, fp->probe.num, true);
     else
     {
         Stopwatch<SnortClock> timer;
@@ -1624,7 +1624,7 @@ void InspectorManager::probe(Packet* p)
 
         timer.start();
 
-        ::execute<true>(p, fp->probe.vec, fp->probe.num);
+        ::execute<true>(p, fp->probe.vec, fp->probe.num, true);
 
         trace_ulogf(snort_trace, TRACE_INSPECTOR_MANAGER, p,
             "end inspection, %s, packet %" PRId64", context %" PRId64", total time: %" PRId64" usec\n",