From f05d70a529f608d7521c9b0fd3ee58e4be82ae36 Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Thu, 8 Oct 2015 18:00:45 -0400 Subject: [PATCH] Merge pull request #67 in SNORT/snort3 from ~MIALTIZE/snort3:master to master Squashed commit of the following: commit 5b1ab4749ded466c91abd47f2f3928859d415461 Author: Michael Altizer Date: Thu Oct 8 17:41:53 2015 -0400 Reorganize profiler sorting defines to match config enum. --- src/time/profiler.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/time/profiler.h b/src/time/profiler.h index fb443f8e6..11709aac5 100644 --- a/src/time/profiler.h +++ b/src/time/profiler.h @@ -46,12 +46,12 @@ struct ProfileStats // Sort preferences for rule profiling #define PROFILE_SORT_CHECKS 1 -#define PROFILE_SORT_MATCHES 2 -#define PROFILE_SORT_NOMATCHES 3 -#define PROFILE_SORT_AVG_TICKS 4 -#define PROFILE_SORT_AVG_TICKS_PER_MATCH 5 -#define PROFILE_SORT_AVG_TICKS_PER_NOMATCH 6 -#define PROFILE_SORT_TOTAL_TICKS 7 +#define PROFILE_SORT_AVG_TICKS 2 +#define PROFILE_SORT_TOTAL_TICKS 3 +#define PROFILE_SORT_MATCHES 4 +#define PROFILE_SORT_NOMATCHES 5 +#define PROFILE_SORT_AVG_TICKS_PER_MATCH 6 +#define PROFILE_SORT_AVG_TICKS_PER_NOMATCH 7 // MACROS that handle profiling of rules and preprocessors #define PROFILE_VARS_NAMED(name) uint64_t name ## _ticks_start, name ## _ticks_end -- 2.47.3