r740 - in trunk/varnish-cache: bin/varnishd bin/varnishlog bin/varnishncsa bin/varnishtester bin/varnishtop include lib/libvarnish
phk at projects.linpro.no
phk at projects.linpro.no
Mon Aug 7 18:42:11 CEST 2006
Author: phk
Date: 2006-08-07 18:42:11 +0200 (Mon, 07 Aug 2006)
New Revision: 740
Added:
trunk/varnish-cache/lib/libvarnish/assert.c
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_session.c
trunk/varnish-cache/bin/varnishd/hash_classic.c
trunk/varnish-cache/bin/varnishd/mgt.h
trunk/varnish-cache/bin/varnishd/mgt_child.c
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_event.c
trunk/varnish-cache/bin/varnishd/mgt_vcc.c
trunk/varnish-cache/bin/varnishd/shmlog.c
trunk/varnish-cache/bin/varnishd/storage_file.c
trunk/varnish-cache/bin/varnishd/tcp.c
trunk/varnish-cache/bin/varnishd/varnishd.c
trunk/varnish-cache/bin/varnishlog/varnishlog.c
trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
trunk/varnish-cache/bin/varnishtester/varnishtester.c
trunk/varnish-cache/bin/varnishtop/varnishtop.c
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/lib/libvarnish/Makefile.am
trunk/varnish-cache/lib/libvarnish/argv.c
Log:
Add our own assert in libvarnish.h
Include libvarnish.h from cache.h and mgt.h
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2006-08-07 16:42:11 UTC (rev 740)
@@ -5,13 +5,14 @@
#include <sys/time.h>
#include <sys/uio.h>
-#include <assert.h>
#include <pthread.h>
#include <stdint.h>
#include "queue.h"
#include "vsb.h"
+#include "libvarnish.h"
+
#include "vcl_returns.h"
#include "common.h"
#include "miniobj.h"
Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -17,7 +17,6 @@
#include <sys/uio.h>
#include <sys/socket.h>
-#include "libvarnish.h"
#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -10,7 +10,6 @@
#include <sys/types.h>
#include <md5.h>
-#include <libvarnish.h>
#include <cache.h>
/*--------------------------------------------------------------------*/
Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/mgt.h 2006-08-07 16:42:11 UTC (rev 740)
@@ -5,6 +5,8 @@
#include "common.h"
#include "miniobj.h"
+#include "libvarnish.h"
+
extern struct evbase *mgt_evb;
/* mgt_child.c */
Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -10,7 +10,6 @@
#include <fcntl.h>
#include <stdlib.h>
#include <signal.h>
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <sys/types.h>
@@ -18,7 +17,6 @@
#include <err.h> /* XXX */
-#include "libvarnish.h"
#include "heritage.h"
#include "mgt.h"
#include "cli.h"
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -6,7 +6,6 @@
#include <sys/types.h>
-#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
Modified: trunk/varnish-cache/bin/varnishd/mgt_event.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_event.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/mgt_event.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -3,7 +3,6 @@
*/
#include <stdio.h>
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <time.h>
@@ -11,6 +10,7 @@
#include <string.h>
#include <stdlib.h>
+#include "mgt.h"
#include "mgt_event.h"
#include "miniobj.h"
#include "binary_heap.h"
Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -6,7 +6,6 @@
#include <sys/types.h>
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -16,7 +15,6 @@
#include "vsb.h"
#include "queue.h"
-#include "libvarnish.h"
#include "libvcl.h"
#include "cli.h"
#include "cli_priv.h"
Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -11,7 +11,6 @@
#include <stdarg.h>
#include <sys/mman.h>
-#include "libvarnish.h"
#include "shmlog.h"
#include "cache.h"
Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -20,7 +20,6 @@
#include <unistd.h>
#include "compat.h"
-#include "libvarnish.h"
#include "shmlog.h"
#include "cache.h"
Modified: trunk/varnish-cache/bin/varnishd/tcp.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/tcp.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/tcp.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -5,7 +5,6 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <assert.h>
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
@@ -13,7 +12,6 @@
#include "heritage.h"
#include "mgt.h"
-#include "libvarnish.h"
/*--------------------------------------------------------------------*/
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -4,7 +4,6 @@
* The management process and CLI handling
*/
-#include <assert.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
@@ -19,7 +18,6 @@
#include "vsb.h"
-#include "libvarnish.h"
#include "cli.h"
#include "cli_priv.h"
#include "cli_common.h"
Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -9,7 +9,6 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <assert.h>
#include <vis.h>
#include "vsb.h"
Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -17,7 +17,6 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <assert.h>
#include <vis.h>
#include <time.h>
Modified: trunk/varnish-cache/bin/varnishtester/varnishtester.c
===================================================================
--- trunk/varnish-cache/bin/varnishtester/varnishtester.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishtester/varnishtester.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -1,5 +1,4 @@
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -10,7 +10,6 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <assert.h>
#include <curses.h>
#include <vis.h>
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/include/libvarnish.h 2006-08-07 16:42:11 UTC (rev 740)
@@ -2,6 +2,7 @@
* $Id$
*/
+#include <errno.h>
#include <time.h>
/* from libvarnish/argv.c */
@@ -15,5 +16,18 @@
/* from libvarnish/version.c */
void varnish_version(const char *);
+/* from libvarnish/assert.c */
+#ifdef WITHOUT_ASSERTS
+#define assert(e) ((void)0)
+#else /* WITH_ASSERTS */
+#define assert(e) \
+do { \
+ if (e) \
+ __assert(__func__, __FILE__, __LINE__, #e, errno); \
+} while (0)
+#endif
+
+void __assert(const char *, const char *, int, const char *, int);
+
/* Assert zero return value */
#define AZ(foo) do { assert((foo) == 0); } while (0)
Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-08-07 16:42:11 UTC (rev 740)
@@ -6,6 +6,7 @@
libvarnish_la_SOURCES = \
argv.c \
+ assert.c \
binary_heap.c \
cli.c \
cli_common.c \
Modified: trunk/varnish-cache/lib/libvarnish/argv.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/argv.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/lib/libvarnish/argv.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -12,7 +12,6 @@
*/
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
Added: trunk/varnish-cache/lib/libvarnish/assert.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/assert.c 2006-08-07 16:29:42 UTC (rev 739)
+++ trunk/varnish-cache/lib/libvarnish/assert.c 2006-08-07 16:42:11 UTC (rev 740)
@@ -0,0 +1,21 @@
+/*
+ * $Id$
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+
+void
+__assert(const char *func, const char *file, int line, const char *cond, int err)
+{
+
+ fprintf(stderr,
+ "Assert error in %s(), %s line %s:\n"
+ " Condition(%s) not true.\n"
+ " errno = %d (%s)\n", func, file, line, cond, err, strerror(err));
+ abort();
+}
+
More information about the varnish-commit
mailing list