varnishevent: merge

f36bf950 · Geoff Simmons · d945413e · f36bf950
Commit f36bf950 authored Dec 03, 2013 by Geoff Simmons
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

writer.c bin/varnishevent/writer.c +2 -2

No files found.
--- a/bin/varnishevent/writer.c
+++ b/bin/varnishevent/writer.c
@@ -215,12 +215,12 @@ static void
 	if (wrt_nfree > 0)
            wrt_return_freelist();
        
+        wrt->state = WRT_WAITING;
        AZ(pthread_mutex_lock(&spscq_ready_lock));
        /*
 	 * run is guaranteed to be fresh after the lock
 	 */
-        if (run) {
-            wrt->state = WRT_WAITING;
+        if (run && !RDR_Waiting()) {
            waits++;
            AZ(pthread_cond_wait(&spscq_ready_cond, &spscq_ready_lock));
        }