Merge pull request #67 in SNORT/snort3 from ~MIALTIZE/snort3:master to master

Squashed commit of the following:

commit 5b1ab4749ded466c91abd47f2f3928859d415461
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Oct 8 17:41:53 2015 -0400

    Reorganize profiler sorting defines to match config enum.

diff --git a/src/time/profiler.h b/src/time/profiler.h
index fb443f8e6bd517887d69f8fff8f4785944958798..11709aac5c52d2dade0957a16871cc925bddc5e1 100644 (file)
--- 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