Revert change in queue handler wait logic. Bug #988.

diff --git a/src/tmqh-flow.c b/src/tmqh-flow.c
index d25fab619eaa4407d086e3b7805cd7f8d3db9b4b..4fdb4d06cede120e5a6070854699eee196707e8d 100644 (file)
--- a/src/tmqh-flow.c
+++ b/src/tmqh-flow.c
@@ -88,7 +88,7 @@ Packet *TmqhInputFlow(ThreadVars *tv)
     SCPerfSyncCountersIfSignalled(tv, 0);
 
     SCMutexLock(&q->mutex_q);
-    while (q->len == 0) {
+    if (q->len == 0) {
         /* if we have no packets in queue, wait... */
         SCCondWait(&q->cond_q, &q->mutex_q);
     }

diff --git a/src/tmqh-simple.c b/src/tmqh-simple.c
index cc5b69c06820383b7189463a135b8f9dab5efd48..fe1902be003b1163ccd800bbe9b85538ebdc4e42 100644 (file)
--- a/src/tmqh-simple.c
+++ b/src/tmqh-simple.c
@@ -50,7 +50,7 @@ Packet *TmqhInputSimple(ThreadVars *t)
 
     SCMutexLock(&q->mutex_q);
 
-    while (q->len == 0) {
+    if (q->len == 0) {
         /* if we have no packets in queue, wait... */
         SCCondWait(&q->cond_q, &q->mutex_q);
     }
@@ -111,7 +111,7 @@ void TmqhOutputSimple(ThreadVars *t, Packet *p)
 SCDQGenericQData *TmqhInputSimpleOnQ(SCDQDataQueue *q)
 {
     SCMutexLock(&q->mutex_q);
-    while (q->len == 0) {
+    if (q->len == 0) {
         /* if we have no packets in queue, wait... */
         SCCondWait(&q->cond_q, &q->mutex_q);
     }