Use less queues and threads in nfq autofp mode.

Moved outputs from their own thread to stream/detect threads.

diff --git a/src/util-runmodes.c b/src/util-runmodes.c
index cdbc3216e2e12d7219a92e9aad5ad73b365d614f..7aa693a6cf26a79fcd5735d7fce450d9d7603ca9 100644 (file)
--- a/src/util-runmodes.c
+++ b/src/util-runmodes.c
@@ -1068,6 +1068,8 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
 
         TmThreadSetCPU(tv_detect_ncpu, DETECT_CPU_SET);
 
+        SetupOutputs(tv_detect_ncpu);
+
         char *thread_group_name = SCStrdup("Detect");
         if (thread_group_name == NULL) {
             SCLogError(SC_ERR_RUNMODE, "Error allocating memory");
@@ -1090,7 +1092,7 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
         ThreadVars *tv_verdict =
             TmThreadCreatePacketHandler(thread_name,
                                         "verdict-queue", "simple",
-                                        "alert-queue", "simple",
+                                        "packetpool", "packetpool",
                                         "varslot");
         if (tv_verdict == NULL) {
             printf("ERROR: TmThreadsCreate failed\n");
@@ -1117,27 +1119,6 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
             exit(EXIT_FAILURE);
         }
     };
-
-    ThreadVars *tv_outputs =
-        TmThreadCreatePacketHandler("Outputs",
-                                    "alert-queue", "simple",
-                                    "packetpool", "packetpool",
-                                    "varslot");
-
-    if (tv_outputs == NULL) {
-        printf("ERROR: TmThreadCreatePacketHandler for Outputs failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    TmThreadSetCPU(tv_outputs, OUTPUT_CPU_SET);
-
-    SetupOutputs(tv_outputs);
-    if (TmThreadSpawn(tv_outputs) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-
     return 0;
 }