Pull request #4167: profiler: improve multithread rule percentage calculation

Merge in SNORT/snort3 from ~ASERBENI/snort3:multithread_rule_percent to master

Squashed commit of the following:

commit 48c52c9279e05dd56fcd7c3d332a144b92f953bb
Author: Andrii Serbeniuk <aserbeni@cisco.com>
Date:   Mon Jan 15 15:55:06 2024 +0200

    profiler: improve multithread rule percentage calculation

diff --git a/src/profiler/json_view.cc b/src/profiler/json_view.cc
index be85c1752f00506c532255f6847d46b289d892a6..29f4f118ff1984007d7af4f03f3124c8f0c6a112 100644 (file)
--- a/src/profiler/json_view.cc
+++ b/src/profiler/json_view.cc
@@ -96,7 +96,8 @@ void print_json_entries(ControlConn* ctrlcon, std::vector<rule_stats::View>& ent
         std::partial_sort(entries.begin(), entries.begin() + count, entries.end(), sort);
 
     double total_time_usec =
-        RuleContext::get_total_time()->tv_sec * 1000000.0 + RuleContext::get_total_time()->tv_usec;
+        ( RuleContext::get_total_time()->tv_sec * 1000000.0 + RuleContext::get_total_time()->tv_usec )
+        * ThreadConfig::get_instance_max();
 
     for ( unsigned i = 0; i < count; ++i )
         print_single_entry(ctrlcon, entries[i], i + 1, count, total_time_usec);

diff --git a/src/profiler/table_view.cc b/src/profiler/table_view.cc
index 3925b8a54c8a6a0e6d2b4553f9b9ec289b55ccbc..484977c56a245a7077e58c7ce9020a7bacfdbc63 100644 (file)
--- a/src/profiler/table_view.cc
+++ b/src/profiler/table_view.cc
@@ -102,7 +102,8 @@ void print_entries(ControlConn* ctrlcon, std::vector<rule_stats::View>& entries,
     RuleContext::count_total_time();
 
     double total_time_usec =
-        RuleContext::get_total_time()->tv_sec * 1000000.0 + RuleContext::get_total_time()->tv_usec;
+        ( RuleContext::get_total_time()->tv_sec * 1000000.0 + RuleContext::get_total_time()->tv_usec )
+        * ThreadConfig::get_instance_max();
 
     StatsTable table(fields, ss);