From e36ded82756b93f9c4440dd4aa6fc1dc9109c47b Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sun, 3 Oct 2021 14:54:17 +0200 Subject: [PATCH] threading: minor cleanups (cherry picked from commit 31977170a8a44290fd8f501ef1018b7696644040) --- src/tm-threads.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/tm-threads.c b/src/tm-threads.c index 51f74c2a77..d9c5160784 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -1339,17 +1339,16 @@ again: if (!fq_done) { SCMutexUnlock(&tv_root_lock); - Packet *p = PacketGetFromAlloc(); - if (p != NULL) { - //SCLogNotice("flush packet created"); - p->flags |= PKT_PSEUDO_STREAM_END; - PKT_SET_SRC(p, PKT_SRC_DETECT_RELOAD_FLUSH); - PacketQueue *q = tv->stream_pq; - SCMutexLock(&q->mutex_q); - PacketEnqueue(q, p); - SCCondSignal(&q->cond_q); - SCMutexUnlock(&q->mutex_q); - } + Packet *p = PacketGetFromAlloc(); + if (p != NULL) { + p->flags |= PKT_PSEUDO_STREAM_END; + PKT_SET_SRC(p, PKT_SRC_DETECT_RELOAD_FLUSH); + PacketQueue *q = tv->stream_pq; + SCMutexLock(&q->mutex_q); + PacketEnqueue(q, p); + SCCondSignal(&q->cond_q); + SCMutexUnlock(&q->mutex_q); + } /* don't sleep while holding a lock */ SleepMsec(1); @@ -1430,7 +1429,6 @@ again: Packet *p = PacketGetFromAlloc(); if (p != NULL) { - //SCLogNotice("flush packet created"); p->flags |= PKT_PSEUDO_STREAM_END; PKT_SET_SRC(p, PKT_SRC_DETECT_RELOAD_FLUSH); PacketQueue *q = tv->stream_pq; -- 2.47.2