From: Andrii Serbeniuk -X (aserbeni - SOFTSERVE INC at Cisco) Date: Thu, 18 Jan 2024 16:03:12 +0000 (+0000) Subject: Pull request #4167: profiler: improve multithread rule percentage calculation X-Git-Tag: 3.1.79.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e8eaa0e44a44938c249a5ee24485f10f7ffd08;p=thirdparty%2Fsnort3.git 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 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 be85c1752..29f4f118f 100644 --- a/src/profiler/json_view.cc +++ b/src/profiler/json_view.cc @@ -96,7 +96,8 @@ void print_json_entries(ControlConn* ctrlcon, std::vector& 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 3925b8a54..484977c56 100644 --- a/src/profiler/table_view.cc +++ b/src/profiler/table_view.cc @@ -102,7 +102,8 @@ void print_entries(ControlConn* ctrlcon, std::vector& 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);