r2260 - in branches/1.2: . bin/varnishd include
des at projects.linpro.no
des at projects.linpro.no
Thu Nov 15 17:06:08 CET 2007
Author: des
Date: 2007-11-15 17:06:08 +0100 (Thu, 15 Nov 2007)
New Revision: 2260
Added:
branches/1.2/bin/varnishd/cache_panic.c
Modified:
branches/1.2/
branches/1.2/bin/varnishd/Makefile.am
branches/1.2/bin/varnishd/cache.h
branches/1.2/include/miniobj.h
Log:
Merged revisions 2253-2254 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache
........
r2253 | des | 2007-11-15 16:07:15 +0100 (Thu, 15 Nov 2007) | 2 lines
Add a VALID_OBJ() predicate macro.
........
r2254 | des | 2007-11-15 17:01:21 +0100 (Thu, 15 Nov 2007) | 7 lines
Bigger hammer: panic() is similar to lbv_assert() but takes a struct sess *
from which it tries to extract as much useful information as possible before
it croaks. The corresponding macro is spassert(), which assumes you have
a struct sess *sp in scope. This should help a lot with bugs like #167
where important information is not available post-mortem (because sp->obj
points into the cache, which is not included in the core dump)
........
Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248-2251
+ /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248-2251,2253-2254
Modified: branches/1.2/bin/varnishd/Makefile.am
===================================================================
--- branches/1.2/bin/varnishd/Makefile.am 2007-11-15 16:05:42 UTC (rev 2259)
+++ branches/1.2/bin/varnishd/Makefile.am 2007-11-15 16:06:08 UTC (rev 2260)
@@ -24,6 +24,7 @@
cache_http.c \
cache_httpconn.c \
cache_main.c \
+ cache_panic.c \
cache_pool.c \
cache_pipe.c \
cache_response.c \
Modified: branches/1.2/bin/varnishd/cache.h
===================================================================
--- branches/1.2/bin/varnishd/cache.h 2007-11-15 16:05:42 UTC (rev 2259)
+++ branches/1.2/bin/varnishd/cache.h 2007-11-15 16:06:08 UTC (rev 2260)
@@ -659,3 +659,17 @@
return
((unsigned)(t.e - t.b));
}
+
+#ifdef WITHOUT_ASSERTS
+#define spassert(cond) ((void)0)
+#else
+void panic(const char *, int, const char *,
+ const struct sess *, const char *, ...);
+#define spassert(cond) \
+ do { \
+ int ok = !!(cond); \
+ if (!ok) \
+ panic(__FILE__, __LINE__, __func__, sp, \
+ "assertion failed: %s\n", #cond); \
+ } while (0)
+#endif
Copied: branches/1.2/bin/varnishd/cache_panic.c (from rev 2254, trunk/varnish-cache/bin/varnishd/cache_panic.c)
===================================================================
--- branches/1.2/bin/varnishd/cache_panic.c (rev 0)
+++ branches/1.2/bin/varnishd/cache_panic.c 2007-11-15 16:06:08 UTC (rev 2260)
@@ -0,0 +1,188 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2007 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Dag-Erling Smørgrav <des at linpro.no>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "cache.h"
+
+#ifndef WITHOUT_ASSERTS
+
+/* panic string */
+char panicstr[65536];
+static char *pstr = panicstr;
+
+#define fp(...) \
+ pstr += snprintf(pstr, \
+ (panicstr + sizeof panicstr) - pstr, \
+ __VA_ARGS__)
+#define vfp(fmt, ap) \
+ pstr += vsnprintf(pstr, \
+ (panicstr + sizeof panicstr) - pstr, \
+ (fmt), (ap))
+
+/* step names */
+static const char *steps[] = {
+#define STEP(l, u) "STP_" #u,
+#include "steps.h"
+#undef STEP
+};
+static int nsteps = sizeof steps / sizeof *steps;
+
+/* dump a struct storage */
+static void
+dump_storage(const struct storage *st)
+{
+ int i, j;
+
+#define MAX_BYTES (4*16)
+#define show(ch) (((ch) > 31 && (ch) < 127) ? (ch) : '.')
+
+ for (i = 0; i < MAX_BYTES && i < st->len; i += 16) {
+ fp(" ");
+ for (j = 0; j < 16; ++j) {
+ if (i + j < st->len)
+ fp("%02x ", st->ptr[i + j]);
+ else
+ fp(" ");
+ }
+ fp("|");
+ for (j = 0; j < 16; ++j)
+ if (i + j < st->len)
+ fp("%c", show(st->ptr[i + j]));
+ fp("|\n");
+ }
+ if (st->len > MAX_BYTES)
+ fp(" [%u more]\n", st->len - MAX_BYTES);
+
+#undef show
+#undef MAX_BYTES
+}
+
+/* dump a struct http */
+static void
+dump_http(const struct http *h)
+{
+ int i;
+
+ fp(" http = {\n");
+ if (h->nhd > HTTP_HDR_FIRST) {
+ fp(" hd = {\n");
+ for (i = HTTP_HDR_FIRST; i < h->nhd; ++i)
+ fp(" \"%.*s\",\n",
+ (int)(h->hd[i].e - h->hd[i].b),
+ h->hd[i].b);
+ fp(" },\n");
+ }
+ fp(" },\n");
+}
+
+/* dump a struct object */
+static void
+dump_object(const struct object *o)
+{
+ const struct storage *st;
+
+ fp(" obj = %p {\n", o);
+ fp(" refcnt = %u, xid = %u,\n", o->refcnt, o->xid);
+ dump_http(o->http);
+ fp(" store = {\n");
+ VTAILQ_FOREACH(st, &o->store, list) {
+ dump_storage(st);
+ }
+ fp(" },\n");
+ fp(" },\n");
+}
+
+/* dump a struct backend */
+static void
+dump_backend(const struct backend *be)
+{
+
+ fp(" backend = %p {\n", be);
+ fp(" vcl_name = \"%s\",\n",
+ be->vcl_name ? be->vcl_name : "(null)");
+ fp(" },\n");
+}
+
+/* dump a struct sess */
+static void
+dump_sess(const struct sess *sp)
+{
+ const struct backend *be = sp->backend;
+ const struct object *obj = sp->obj;
+
+ fp("sp = %p {\n", sp);
+ fp(" fd = %d, id = %d, xid = %u,\n", sp->fd, sp->id, sp->xid);
+ fp(" client = %s:%s,\n",
+ sp->addr ? sp->addr : "?.?.?.?",
+ sp->port ? sp->port : "?");
+ if (sp->step < nsteps)
+ fp(" step = %s,\n", steps[sp->step]);
+ else
+ fp(" step = %d,\n", sp->step);
+ if (sp->err_code)
+ fp(" err_code = %d, err_reason = %s,\n", sp->err_code,
+ sp->err_reason ? sp->err_reason : "(null)");
+
+ if (VALID_OBJ(be, BACKEND_MAGIC))
+ dump_backend(be);
+
+ if (VALID_OBJ(obj, OBJECT_MAGIC))
+ dump_object(obj);
+
+ fp("},\n");
+}
+
+/* report as much information as we can before we croak */
+void
+panic(const char *file, int line, const char *func,
+ const struct sess *sp, const char *fmt, ...)
+{
+ va_list ap;
+
+ fp("panic in %s() at %s:%d\n", func, file, line);
+ va_start(ap, fmt);
+ vfp(fmt, ap);
+ va_end(ap);
+
+ if (VALID_OBJ(sp, SESS_MAGIC))
+ dump_sess(sp);
+
+ fputs(panicstr, stderr);
+
+ /* I wish there was a way to flush the log buffers... */
+ signal(SIGABRT, SIG_DFL);
+ raise(SIGABRT);
+}
+
+#endif
Modified: branches/1.2/include/miniobj.h
===================================================================
--- branches/1.2/include/miniobj.h 2007-11-15 16:05:42 UTC (rev 2259)
+++ branches/1.2/include/miniobj.h 2007-11-15 16:06:08 UTC (rev 2260)
@@ -12,6 +12,9 @@
free(to); \
} while (0)
+#define VALID_OBJ(ptr, type_magic) \
+ ((ptr) != NULL && (ptr)->magic == (type_magic))
+
#define CHECK_OBJ(ptr, type_magic) \
do { \
assert((ptr)->magic == type_magic); \
More information about the varnish-commit
mailing list