detect/alert: optimize no-alert path

Skip qsort call if no alerts are queued. Move logic into inline helper func.

diff --git a/src/detect-engine-alert.c b/src/detect-engine-alert.c
index 9e9a499bb5b2edeb633d4f6727d2fe058f5a5e5a..cf893700caf897deb73c2cf4762d6b26ec5b7e36 100644 (file)
--- a/src/detect-engine-alert.c
+++ b/src/detect-engine-alert.c
@@ -359,22 +359,14 @@ static inline void FlowApplySignatureActions(
     }
 }
 
-/**
- * \brief Check the threshold of the sigs that match, set actions, break on pass action
- *        This function iterate the packet alerts array, removing those that didn't match
- *        the threshold, and those that match after a signature with the action "pass".
- *        The array is sorted by action priority/order
- * \param de_ctx detection engine context
- * \param det_ctx detection engine thread context
- * \param p pointer to the packet
- */
-void PacketAlertFinalize(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, Packet *p)
+static inline void PacketAlertFinalizeProcessQueue(
+        const DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, Packet *p)
 {
-    SCEnter();
-
-    /* sort the alert queue before thresholding and appending to Packet */
-    qsort(det_ctx->alert_queue, det_ctx->alert_queue_size, sizeof(PacketAlert),
-            AlertQueueSortHelper);
+    if (det_ctx->alert_queue_size > 1) {
+        /* sort the alert queue before thresholding and appending to Packet */
+        qsort(det_ctx->alert_queue, det_ctx->alert_queue_size, sizeof(PacketAlert),
+                AlertQueueSortHelper);
+    }
 
     for (uint16_t i = 0; i < det_ctx->alert_queue_size; i++) {
         PacketAlert *pa = &det_ctx->alert_queue[i];
@@ -433,6 +425,24 @@ void PacketAlertFinalize(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx
             p->alerts.discarded++;
         }
     }
+}
+
+/**
+ * \brief Check the threshold of the sigs that match, set actions, break on pass action
+ *        This function iterate the packet alerts array, removing those that didn't match
+ *        the threshold, and those that match after a signature with the action "pass".
+ *        The array is sorted by action priority/order
+ * \param de_ctx detection engine context
+ * \param det_ctx detection engine thread context
+ * \param p pointer to the packet
+ */
+void PacketAlertFinalize(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, Packet *p)
+{
+    SCEnter();
+
+    if (det_ctx->alert_queue_size > 0) {
+        PacketAlertFinalizeProcessQueue(de_ctx, det_ctx, p);
+    }
 
     /* At this point, we should have all the new alerts. Now check the tag
      * keyword context for sessions and hosts */