Commit f36bf950 authored by Geoff Simmons's avatar Geoff Simmons

varnishevent: merge

parent d945413e
...@@ -215,12 +215,12 @@ static void ...@@ -215,12 +215,12 @@ static void
if (wrt_nfree > 0) if (wrt_nfree > 0)
wrt_return_freelist(); wrt_return_freelist();
wrt->state = WRT_WAITING;
AZ(pthread_mutex_lock(&spscq_ready_lock)); AZ(pthread_mutex_lock(&spscq_ready_lock));
/* /*
* run is guaranteed to be fresh after the lock * run is guaranteed to be fresh after the lock
*/ */
if (run) { if (run && !RDR_Waiting()) {
wrt->state = WRT_WAITING;
waits++; waits++;
AZ(pthread_cond_wait(&spscq_ready_cond, &spscq_ready_lock)); AZ(pthread_cond_wait(&spscq_ready_cond, &spscq_ready_lock));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment