r963 - in trunk/varnish-cache: bin/varnishd include
phk at projects.linpro.no
phk at projects.linpro.no
Mon Sep 11 13:55:01 CEST 2006
Author: phk
Date: 2006-09-11 13:55:00 +0200 (Mon, 11 Sep 2006)
New Revision: 963
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/include/libvarnish.h
Log:
Move LOCK/UNLOCK macros to cache.h where they belong.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2006-09-11 10:35:26 UTC (rev 962)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2006-09-11 11:55:00 UTC (rev 963)
@@ -433,3 +433,14 @@
/* rfc2616.c */
int RFC2616_cache_policy(struct sess *sp, struct http *hp);
+
+#define LOCKSHM(foo) AZ(pthread_mutex_lock(foo))
+#define UNLOCKSHM(foo) AZ(pthread_mutex_unlock(foo))
+
+#if 1
+#define LOCK(foo) AZ(pthread_mutex_lock(foo))
+#define UNLOCK(foo) AZ(pthread_mutex_unlock(foo))
+#else
+#define LOCK(foo) do { AZ(pthread_mutex_lock(foo)); VSL(SLT_Debug, 0, "LOCK(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
+#define UNLOCK(foo) do { AZ(pthread_mutex_unlock(foo)); VSL(SLT_Debug, 0, "UNLOC(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
+#endif
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2006-09-11 10:35:26 UTC (rev 962)
+++ trunk/varnish-cache/include/libvarnish.h 2006-09-11 11:55:00 UTC (rev 963)
@@ -56,14 +56,3 @@
#define AN(foo) do { assert((foo) != NULL); } while (0)
#define XXXAZ(foo) do { xxxassert((foo) == 0); } while (0)
#define XXXAN(foo) do { xxxassert((foo) != NULL); } while (0)
-
-#define LOCKSHM(foo) AZ(pthread_mutex_lock(foo))
-#define UNLOCKSHM(foo) AZ(pthread_mutex_unlock(foo))
-
-#if 1
-#define LOCK(foo) AZ(pthread_mutex_lock(foo))
-#define UNLOCK(foo) AZ(pthread_mutex_unlock(foo))
-#else
-#define LOCK(foo) do { AZ(pthread_mutex_lock(foo)); VSL(SLT_Debug, 0, "LOCK(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
-#define UNLOCK(foo) do { AZ(pthread_mutex_unlock(foo)); VSL(SLT_Debug, 0, "UNLOC(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
-#endif
More information about the varnish-commit
mailing list