Merge pull request #1741 in SNORT/snort3 from ~STECHEW/snort3:profiler_output to...

Squashed commit of the following:

commit 623c678d5fc25492f98cd58c27e2c99cbb804552
Author: Steve Chew <stechew@cisco.com>
Date:   Tue Sep 10 10:15:16 2019 -0400

    profiler: Increase width of checks and alloc fields so values don't run together

diff --git a/src/profiler/memory_profiler.cc b/src/profiler/memory_profiler.cc
index 38a292e01a0038791c38e165c1591128699b2e56..4ba53ef4303aa06005ca69519416bad30ccc31a9 100644 (file)
--- a/src/profiler/memory_profiler.cc
+++ b/src/profiler/memory_profiler.cc
@@ -48,7 +48,7 @@ static const StatsTable::Field fields[] =
     { "#", 5, ' ', 0, std::ios_base::left },
     { "module", 20, ' ', 0, std::ios_base::fmtflags() },
     { "layer", 6, ' ', 0, std::ios_base::fmtflags() },
-    { "allocs", 7, ' ', 0, std::ios_base::fmtflags() },
+    { "allocs", 9, ' ', 0, std::ios_base::fmtflags() },
     { "used (kb)", 12, ' ', 2, std::ios_base::fmtflags() },
     { "avg/allocation", 15, ' ', 1, std::ios_base::fmtflags() },
     { "%/caller", 10, ' ', 2, std::ios_base::fmtflags() },

diff --git a/src/profiler/rule_profiler.cc b/src/profiler/rule_profiler.cc
index 3fa0d078f562c261176919df7da0ff7cd1ded289..5012896dbe502ead6e57fa52fe76896c917eb869 100644 (file)
--- a/src/profiler/rule_profiler.cc
+++ b/src/profiler/rule_profiler.cc
@@ -76,7 +76,7 @@ static const StatsTable::Field fields[] =
     { "gid", 6, '\0', 0, std::ios_base::fmtflags() },
     { "sid", 6, '\0', 0, std::ios_base::fmtflags() },
     { "rev", 4, '\0', 0, std::ios_base::fmtflags() },
-    { "checks", 7, '\0', 0, std::ios_base::fmtflags() },
+    { "checks", 10, '\0', 0, std::ios_base::fmtflags() },
     { "matches", 8, '\0', 0, std::ios_base::fmtflags() },
     { "alerts", 7, '\0', 0, std::ios_base::fmtflags() },
     { "time (us)", 10, '\0', 0, std::ios_base::fmtflags() },