threading: minor cleanups

src/tm-threads.c

@@ -1339,17 +1339,16 @@ again:
             if (!fq_done) {
                 SCMutexUnlock(&tv_root_lock);
 
-                    Packet *p = PacketGetFromAlloc();
+                Packet *p = PacketGetFromAlloc();
-                    if (p != NULL) {
+                if (p != NULL) {
-                        //SCLogNotice("flush packet created");
+                    p->flags |= PKT_PSEUDO_STREAM_END;
-                        p->flags |= PKT_PSEUDO_STREAM_END;
+                    PKT_SET_SRC(p, PKT_SRC_DETECT_RELOAD_FLUSH);
-                        PKT_SET_SRC(p, PKT_SRC_DETECT_RELOAD_FLUSH);
+                    PacketQueue *q = tv->stream_pq;
-                        PacketQueue *q = tv->stream_pq;
+                    SCMutexLock(&q->mutex_q);
-                        SCMutexLock(&q->mutex_q);
+                    PacketEnqueue(q, p);
-                        PacketEnqueue(q, p);
+                    SCCondSignal(&q->cond_q);
-                        SCCondSignal(&q->cond_q);
+                    SCMutexUnlock(&q->mutex_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;