flow-recycler: speed up flow-recycler shutdown

Thread was killed by the generic TmThreadKillThreads instead of
the FlowKillFlowRecyclerThread. The latter wakes the thread up, so
that shutdown is quite a bit faster.

diff --git a/src/flow-manager.c b/src/flow-manager.c
index d175f02bb48f66faf0155a1ffedb3507043fff5b..bea4b6b35169db97563b7a934f691a1b0e7263e7 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -769,6 +769,8 @@ void FlowKillFlowRecyclerThread(void)
             TmThreadsSetFlag(tv, THV_KILL);
             TmThreadsSetFlag(tv, THV_DEINIT);
 
+            SCCtrlCondSignal(&flow_recycler_ctrl_cond);
+
             /* be sure it has shut down */
             while (!TmThreadsCheckFlag(tv, THV_CLOSED)) {
                 usleep(100);

diff --git a/src/suricata.c b/src/suricata.c
index ebbea361f25c7493985c464b6bfc7ff2adec14bd..9be6671abd6c5070252ed290326eb6fad974f7d2 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2402,11 +2402,16 @@ int main(int argc, char **argv)
         BUG_ON(global_de_ctx == NULL);
     }
 
+    /* before TmThreadKillThreads, as otherwise that kills it
+     * but more slowly */
+    if (suri.run_mode != RUNMODE_UNIX_SOCKET) {
+        FlowKillFlowRecyclerThread();
+    }
+
     TmThreadKillThreads();
 
     if (suri.run_mode != RUNMODE_UNIX_SOCKET) {
         SCPerfReleaseResources();
-        FlowKillFlowRecyclerThread();
         FlowShutdown();
         StreamTcpFreeConfig(STREAM_VERBOSE);
     }