From: Victor Julien <victor@inliniac.net>
Date: Sun, 3 Nov 2019 19:42:47 +0000 (+0100)
Subject: flow-manager: avoid doubly signaling threads
X-Git-Tag: suricata-6.0.0-beta1~813
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fd35fb78683a5bf93140c353d621e747810c92e;p=thirdparty%2Fsuricata.git

flow-manager: avoid doubly signaling threads

Don't try to wake up the threads we just flagged and validated that
they changed their state.
---

diff --git a/src/flow-manager.c b/src/flow-manager.c
index e515332192..ddfdbdd887 100644
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -190,10 +190,6 @@ again:
     }
     SCMutexUnlock(&tv_root_lock);
 
-    /* wake up threads, another try */
-    for (u = 0; u < flowmgr_number; u++)
-        SCCtrlCondSignal(&flow_manager_ctrl_cond);
-
     /* reset count, so we can kill and respawn (unix socket) */
     SC_ATOMIC_SET(flowmgr_cnt, 0);
     return;
@@ -1155,10 +1151,6 @@ again:
     }
     SCMutexUnlock(&tv_root_lock);
 
-    /* wake up threads, another try */
-    for (u = 0; u < flowrec_number; u++)
-        SCCtrlCondSignal(&flow_recycler_ctrl_cond);
-
     /* reset count, so we can kill and respawn (unix socket) */
     SC_ATOMIC_SET(flowrec_cnt, 0);
     return;