From: phk Date: Sat, 23 Feb 2008 19:48:11 +0000 (+0000) Subject: Introduce a TRYLOCK() macro, and remove two ';' which could cause grief. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aca62aeceb2f3cf61c840bf884d28dc85eeffd61;p=varnish Introduce a TRYLOCK() macro, and remove two ';' which could cause grief. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2533 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h index 9675b000..4c535fb2 100644 --- a/varnish-cache/bin/varnishd/cache.h +++ b/varnish-cache/bin/varnishd/cache.h @@ -595,29 +595,39 @@ int RFC2616_cache_policy(const struct sess *sp, const struct http *hp); #define MTX pthread_mutex_t #define MTX_INIT(foo) AZ(pthread_mutex_init(foo, NULL)) #define MTX_DESTROY(foo) AZ(pthread_mutex_destroy(foo)) -#define LOCK(foo) \ -do { \ - if (!(params->diag_bitmap & 0x18)) { \ - AZ(pthread_mutex_lock(foo)); \ - } else if (pthread_mutex_trylock(foo)) { \ - VSL(SLT_Debug, 0, \ - "MTX_CONTEST(%s,%s,%d," #foo ")", \ - __func__, __FILE__, __LINE__); \ - AZ(pthread_mutex_lock(foo)); \ - } else if (params->diag_bitmap & 0x8) { \ - VSL(SLT_Debug, 0, \ - "MTX_LOCK(%s,%s,%d," #foo ")", \ - __func__, __FILE__, __LINE__); \ - } \ -} while (0); -#define UNLOCK(foo) \ -do { \ - AZ(pthread_mutex_unlock(foo)); \ - if (params->diag_bitmap & 0x8) \ - VSL(SLT_Debug, 0, \ - "MTX_UNLOCK(%s,%s,%d," #foo ")", \ - __func__, __FILE__, __LINE__); \ -} while (0); +#define TRYLOCK(foo, r) \ +do { \ + (r) = pthread_mutex_trylock(foo); \ + assert((r) == 0 || errno == EBUSY); \ + if (params->diag_bitmap & 0x8) { \ + VSL(SLT_Debug, 0, \ + "MTX_TRYLOCK(%s,%s,%d," #foo ") = %d", \ + __func__, __FILE__, __LINE__, (r)); \ + } \ +} while (0) +#define LOCK(foo) \ +do { \ + if (!(params->diag_bitmap & 0x18)) { \ + AZ(pthread_mutex_lock(foo)); \ + } else if (pthread_mutex_trylock(foo)) { \ + VSL(SLT_Debug, 0, \ + "MTX_CONTEST(%s,%s,%d," #foo ")", \ + __func__, __FILE__, __LINE__); \ + AZ(pthread_mutex_lock(foo)); \ + } else if (params->diag_bitmap & 0x8) { \ + VSL(SLT_Debug, 0, \ + "MTX_LOCK(%s,%s,%d," #foo ")", \ + __func__, __FILE__, __LINE__); \ + } \ +} while (0) +#define UNLOCK(foo) \ +do { \ + AZ(pthread_mutex_unlock(foo)); \ + if (params->diag_bitmap & 0x8) \ + VSL(SLT_Debug, 0, \ + "MTX_UNLOCK(%s,%s,%d," #foo ")", \ + __func__, __FILE__, __LINE__); \ +} while (0) #if defined(HAVE_PTHREAD_MUTEX_ISOWNED_NP) #define ALOCKED(mutex) AN(pthread_mutex_isowned_np((mutex)))