r4169 - branches/2.0/varnish-cache/bin/varnishd
sky at projects.linpro.no
sky at projects.linpro.no
Fri Jul 31 11:41:20 CEST 2009
Author: sky
Date: 2009-07-31 11:41:20 +0200 (Fri, 31 Jul 2009)
New Revision: 4169
Modified:
branches/2.0/varnish-cache/bin/varnishd/cache_lck.c
Log:
merge r4168
Modified: branches/2.0/varnish-cache/bin/varnishd/cache_lck.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_lck.c 2009-07-31 09:18:52 UTC (rev 4168)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_lck.c 2009-07-31 09:41:20 UTC (rev 4169)
@@ -78,7 +78,7 @@
return;
}
r = pthread_mutex_trylock(&ilck->mtx);
- assert(r == 0 || errno == EBUSY);
+ assert(r == 0 || r == EBUSY);
if (r) {
VSL(SLT_Debug, 0, "MTX_CONTEST(%s,%s,%d,%s)", p, f, l, ilck->w);
AZ(pthread_mutex_lock(&ilck->mtx));
More information about the varnish-commit
mailing list