detect: profiling update for new detect code

diff --git a/src/detect.c b/src/detect.c
index fb450a93dee5feb3fc1a6df3370da59c0255384e..9367a854ab6b487323ba3b12c8cbe756805602c1 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -137,7 +137,9 @@ static void DetectRun(ThreadVars *th_v,
 
     /* run tx/state inspection */
     if (pflow && pflow->alstate) {
+        PACKET_PROFILING_DETECT_START(p, PROF_DETECT_TX);
         DetectRunTx(th_v, de_ctx, det_ctx, p, pflow, &scratch);
+        PACKET_PROFILING_DETECT_END(p, PROF_DETECT_TX);
     }
 
 end:
@@ -725,13 +727,11 @@ static inline void DetectRunPrefilterPkt(
     }
     PACKET_PROFILING_DETECT_END(p, PROF_DETECT_NONMPMLIST);
 
-    PACKET_PROFILING_DETECT_START(p, PROF_DETECT_PREFILTER);
     /* run the prefilter engines */
     Prefilter(det_ctx, scratch->sgh, p, scratch->flow_flags);
     PACKET_PROFILING_DETECT_START(p, PROF_DETECT_PF_SORT2);
     DetectPrefilterMergeSort(de_ctx, det_ctx);
     PACKET_PROFILING_DETECT_END(p, PROF_DETECT_PF_SORT2);
-    PACKET_PROFILING_DETECT_END(p, PROF_DETECT_PREFILTER);
 
 #ifdef PROFILING
     if (tv) {
@@ -913,6 +913,8 @@ static DetectRunScratchpad DetectRunSetup(
     uint8_t flow_flags = 0; /* flow/state flags */
     bool app_decoder_events = false;
 
+    PACKET_PROFILING_DETECT_START(p, PROF_DETECT_SETUP);
+
 #ifdef UNITTESTS
     p->alerts.cnt = 0;
 #endif
@@ -989,6 +991,7 @@ static DetectRunScratchpad DetectRunSetup(
     }
 
     DetectRunScratchpad pad = { alproto, flow_flags, app_decoder_events, NULL, 0 };
+    PACKET_PROFILING_DETECT_END(p, PROF_DETECT_SETUP);
     return pad;
 }
 
@@ -1002,9 +1005,9 @@ static inline void DetectRunPostRules(
 {
     /* see if we need to increment the inspect_id and reset the de_state */
     if (pflow && pflow->alstate && AppLayerParserProtocolSupportsTxs(p->proto, scratch->alproto)) {
-        PACKET_PROFILING_DETECT_START(p, PROF_DETECT_STATEFUL_UPDATE);
+        PACKET_PROFILING_DETECT_START(p, PROF_DETECT_TX_UPDATE);
         DeStateUpdateInspectTransactionId(pflow, scratch->flow_flags, (scratch->sgh == NULL));
-        PACKET_PROFILING_DETECT_END(p, PROF_DETECT_STATEFUL_UPDATE);
+        PACKET_PROFILING_DETECT_END(p, PROF_DETECT_TX_UPDATE);
     }
 
     /* so now let's iterate the alerts and remove the ones after a pass rule
@@ -1365,8 +1368,10 @@ static void DetectRunTx(ThreadVars *tv,
 
         /* run prefilter engines and merge results into a candidates array */
         if (sgh->tx_engines) {
+            PACKET_PROFILING_DETECT_START(p, PROF_DETECT_PF_TX);
             DetectRunPrefilterTx(det_ctx, sgh, p, ipproto, flow_flags, alproto,
                     alstate, &tx);
+            PACKET_PROFILING_DETECT_END(p, PROF_DETECT_PF_TX);
             SCLogDebug("%p/%"PRIu64" rules added from prefilter: %u candidates",
                     tx.tx_ptr, tx_id, det_ctx->pmq.rule_id_array_cnt);
 
@@ -1509,6 +1514,7 @@ static void DetectRunTx(ThreadVars *tv,
             }
 
             /* call individual rule inspection */
+            RULE_PROFILING_START(p);
             const int r = DetectRunTxInspectRule(tv, de_ctx, det_ctx, p, f, flow_flags,
                     alstate, &tx, s, inspect_flags, can, scratch);
             if (r == 1) {
@@ -1527,6 +1533,7 @@ static void DetectRunTx(ThreadVars *tv,
                 }
             }
             DetectVarProcessList(det_ctx, p->flow, p);
+            RULE_PROFILING_END(det_ctx, s, r, p);
         }
 
         det_ctx->tx_id = 0;

diff --git a/src/suricata-common.h b/src/suricata-common.h
index fca913d63fc16457e49bdf20ac29943e4d487fb0..2873c46c0fdc06b4e3b02dde3962335119c4d2a5 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -375,12 +375,11 @@
 #define SCNtohs(x) (uint16_t)ntohs((x))
 
 typedef enum PacketProfileDetectId_ {
+    PROF_DETECT_SETUP,
+    PROF_DETECT_GETSGH,
     PROF_DETECT_IPONLY,
     PROF_DETECT_RULES,
-    PROF_DETECT_STATEFUL_START,
-    PROF_DETECT_STATEFUL_CONT,
-    PROF_DETECT_STATEFUL_UPDATE,
-    PROF_DETECT_PREFILTER,
+    PROF_DETECT_TX,
     PROF_DETECT_PF_PKT,
     PROF_DETECT_PF_PAYLOAD,
     PROF_DETECT_PF_TX,
@@ -388,9 +387,8 @@ typedef enum PacketProfileDetectId_ {
     PROF_DETECT_PF_SORT2,
     PROF_DETECT_NONMPMLIST,
     PROF_DETECT_ALERT,
+    PROF_DETECT_TX_UPDATE,
     PROF_DETECT_CLEANUP,
-    PROF_DETECT_GETSGH,
-    PROF_DETECT_MPM_FD_SMTP,
 
     PROF_DETECT_SIZE,
 } PacketProfileDetectId;

diff --git a/src/util-profiling.c b/src/util-profiling.c
index e50cb6feb2bb2ec0ccc0317ecd0e3618bc56a30e..728f5758c0396502643f43267397efc2db15a9f4 100644 (file)
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -1204,21 +1204,20 @@ int SCProfileRuleStart(Packet *p)
 const char * PacketProfileDetectIdToString(PacketProfileDetectId id)
 {
     switch (id) {
+        CASE_CODE (PROF_DETECT_SETUP);
+        CASE_CODE (PROF_DETECT_GETSGH);
         CASE_CODE (PROF_DETECT_IPONLY);
         CASE_CODE (PROF_DETECT_RULES);
-        CASE_CODE (PROF_DETECT_PREFILTER);
         CASE_CODE (PROF_DETECT_PF_PKT);
         CASE_CODE (PROF_DETECT_PF_PAYLOAD);
         CASE_CODE (PROF_DETECT_PF_TX);
         CASE_CODE (PROF_DETECT_PF_SORT1);
         CASE_CODE (PROF_DETECT_PF_SORT2);
-        CASE_CODE (PROF_DETECT_STATEFUL_START);
-        CASE_CODE (PROF_DETECT_STATEFUL_CONT);
-        CASE_CODE (PROF_DETECT_STATEFUL_UPDATE);
+        CASE_CODE (PROF_DETECT_NONMPMLIST);
+        CASE_CODE (PROF_DETECT_TX);
         CASE_CODE (PROF_DETECT_ALERT);
+        CASE_CODE (PROF_DETECT_TX_UPDATE);
         CASE_CODE (PROF_DETECT_CLEANUP);
-        CASE_CODE (PROF_DETECT_GETSGH);
-        CASE_CODE (PROF_DETECT_NONMPMLIST);
         default:
             return "UNKNOWN";
     }