r2418 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2008-02-03 23:26:25 +0100 (Sun, 03 Feb 2008)
New Revision: 2418

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_main.c
Log:
Centralize <pthread_np.h> include, and use pthread_mutex_islocked_np() for
ALOCKED() if available.


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2008-02-03 15:59:01 UTC (rev 2417)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2008-02-03 22:26:25 UTC (rev 2418)
@@ -34,6 +34,9 @@
 #include <sys/socket.h>
 
 #include <pthread.h>
+#ifdef HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
 #include <stdint.h>
 
 #include "vqueue.h"
@@ -657,10 +660,12 @@
 } while (0);
 #endif
 
-#ifdef DIAGNOSTICS
-#define ALOCKED(foo)		AN(pthread_mutex_trylock(foo))
+#if defined(HAVE_PTHREAD_MUTEX_ISLOCKED_NP)
+#define ALOCKED(mutex)		AN(pthread_mutex_islocked_np((mutex)))
+#elif defined(DIAGNOSTICS)
+#define ALOCKED(mutex)		AN(pthread_mutex_trylock((mutex)))
 #else
-#define ALOCKED(foo)		(void)(foo)
+#define ALOCKED(mutex)		(void)(mutex)
 #endif
 
 /*

Modified: trunk/varnish-cache/bin/varnishd/cache_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_main.c	2008-02-03 15:59:01 UTC (rev 2417)
+++ trunk/varnish-cache/bin/varnishd/cache_main.c	2008-02-03 22:26:25 UTC (rev 2418)
@@ -43,10 +43,6 @@
  * Name threads if our pthreads implementation supports it.
  */
 
-#ifdef HAVE_PTHREAD_NP_H
-#include <pthread_np.h>
-#endif
-
 void
 THR_Name(const char *name)
 {