Skip to content

V
varnish-cache
Commit 0ae79f5e authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Communicate the panic string through heritage too.

parent 9584dc03
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 93 deletions
bin/varnishd/cache/cache_panic.c
View file @ 0ae79f5e
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "cache.h" #include "cache.h"
#include "common/heritage.h"
#include "cache_backend.h" #include "cache_backend.h"
#include "waiter/cache_waiter.h" #include "waiter/cache_waiter.h"
...@@ -53,37 +54,33 @@ ...@@ -53,37 +54,33 @@
* (gdb) printf "%s", panicstr * (gdb) printf "%s", panicstr
*/ */
static struct vsb vsps, *vsp; static struct vsb pan_vsp_storage, *pan_vsp;
static pthread_mutex_t panicstr_mtx = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t panicstr_mtx = PTHREAD_MUTEX_INITIALIZER;
/* Initialized in mgt_shmem.c, points into VSM */
char *PAN_panicstr;
unsigned PAN_panicstr_len;
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static void static void
pan_ws(const struct ws *ws, int indent) pan_ws(const struct ws *ws, int indent)
{ {
VSB_printf(vsp, "%*sws = %p { %s\n", indent, "", VSB_printf(pan_vsp, "%*sws = %p { %s\n", indent, "",
ws, ws->overflow ? "overflow" : ""); ws, ws->overflow ? "overflow" : "");
VSB_printf(vsp, "%*sid = \"%s\",\n", indent + 2, "", ws->id); VSB_printf(pan_vsp, "%*sid = \"%s\",\n", indent + 2, "", ws->id);
VSB_printf(vsp, "%*s{s,f,r,e} = {%p", indent + 2, "", ws->s); VSB_printf(pan_vsp, "%*s{s,f,r,e} = {%p", indent + 2, "", ws->s);
if (ws->f > ws->s) if (ws->f > ws->s)
VSB_printf(vsp, ",+%ld", (long) (ws->f - ws->s)); VSB_printf(pan_vsp, ",+%ld", (long) (ws->f - ws->s));
else else
VSB_printf(vsp, ",%p", ws->f); VSB_printf(pan_vsp, ",%p", ws->f);
if (ws->r > ws->s) if (ws->r > ws->s)
VSB_printf(vsp, ",+%ld", (long) (ws->r - ws->s)); VSB_printf(pan_vsp, ",+%ld", (long) (ws->r - ws->s));
else else
VSB_printf(vsp, ",%p", ws->r); VSB_printf(pan_vsp, ",%p", ws->r);
if (ws->e > ws->s) if (ws->e > ws->s)
VSB_printf(vsp, ",+%ld", (long) (ws->e - ws->s)); VSB_printf(pan_vsp, ",+%ld", (long) (ws->e - ws->s));
else else
VSB_printf(vsp, ",%p", ws->e); VSB_printf(pan_vsp, ",%p", ws->e);
VSB_printf(vsp, "},\n"); VSB_printf(pan_vsp, "},\n");
VSB_printf(vsp, "%*s},\n", indent, "" ); VSB_printf(pan_vsp, "%*s},\n", indent, "" );
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -96,9 +93,9 @@ pan_vbc(const struct vbc *vbc) ...@@ -96,9 +93,9 @@ pan_vbc(const struct vbc *vbc)
be = vbc->backend; be = vbc->backend;
VSB_printf(vsp, " backend = %p fd = %d {\n", be, vbc->fd); VSB_printf(pan_vsp, " backend = %p fd = %d {\n", be, vbc->fd);
VSB_printf(vsp, " display_name = \"%s\",\n", be->display_name); VSB_printf(pan_vsp, " display_name = \"%s\",\n", be->display_name);
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -111,24 +108,26 @@ pan_storage(const struct storage *st) ...@@ -111,24 +108,26 @@ pan_storage(const struct storage *st)
#define MAX_BYTES (4*16) #define MAX_BYTES (4*16)
#define show(ch) (((ch) > 31 && (ch) < 127) ? (ch) : '.') #define show(ch) (((ch) > 31 && (ch) < 127) ? (ch) : '.')
VSB_printf(vsp, " %u {\n", st->len); VSB_printf(pan_vsp, " %u {\n", st->len);
for (i = 0; i < MAX_BYTES && i < st->len; i += 16) { for (i = 0; i < MAX_BYTES && i < st->len; i += 16) {
VSB_printf(vsp, " "); VSB_printf(pan_vsp, " ");
for (j = 0; j < 16; ++j) { for (j = 0; j < 16; ++j) {
if (i + j < st->len) if (i + j < st->len)
VSB_printf(vsp, "%02x ", st->ptr[i + j]); VSB_printf(pan_vsp, "%02x ", st->ptr[i + j]);
else else
VSB_printf(vsp, " "); VSB_printf(pan_vsp, " ");
} }
VSB_printf(vsp, "|"); VSB_printf(pan_vsp, "|");
for (j = 0; j < 16; ++j) for (j = 0; j < 16; ++j)
if (i + j < st->len) if (i + j < st->len)
VSB_printf(vsp, "%c", show(st->ptr[i + j])); VSB_printf(pan_vsp,
VSB_printf(vsp, "|\n"); "%c", show(st->ptr[i + j]));
VSB_printf(pan_vsp, "|\n");
} }
if (st->len > MAX_BYTES) if (st->len > MAX_BYTES)
VSB_printf(vsp, " [%u more]\n", st->len - MAX_BYTES); VSB_printf(pan_vsp,
VSB_printf(vsp, " },\n"); " [%u more]\n", st->len - MAX_BYTES);
VSB_printf(pan_vsp, " },\n");
#undef show #undef show
#undef MAX_BYTES #undef MAX_BYTES
...@@ -141,17 +140,17 @@ pan_http(const char *id, const struct http *h, int indent) ...@@ -141,17 +140,17 @@ pan_http(const char *id, const struct http *h, int indent)
{ {
int i; int i;
VSB_printf(vsp, "%*shttp[%s] = {\n", indent, "", id); VSB_printf(pan_vsp, "%*shttp[%s] = {\n", indent, "", id);
VSB_printf(vsp, "%*sws = %p[%s]\n", indent + 2, "", VSB_printf(pan_vsp, "%*sws = %p[%s]\n", indent + 2, "",
h->ws, h->ws ? h->ws->id : ""); h->ws, h->ws ? h->ws->id : "");
for (i = 0; i < h->nhd; ++i) { for (i = 0; i < h->nhd; ++i) {
if (h->hd[i].b == NULL && h->hd[i].e == NULL) if (h->hd[i].b == NULL && h->hd[i].e == NULL)
continue; continue;
VSB_printf(vsp, "%*s\"%.*s\",\n", indent + 4, "", VSB_printf(pan_vsp, "%*s\"%.*s\",\n", indent + 4, "",
(int)(h->hd[i].e - h->hd[i].b), (int)(h->hd[i].e - h->hd[i].b),
h->hd[i].b); h->hd[i].b);
} }
VSB_printf(vsp, "%*s},\n", indent, ""); VSB_printf(pan_vsp, "%*s},\n", indent, "");
} }
...@@ -162,16 +161,16 @@ pan_object(const struct object *o) ...@@ -162,16 +161,16 @@ pan_object(const struct object *o)
{ {
const struct storage *st; const struct storage *st;
VSB_printf(vsp, " obj = %p {\n", o); VSB_printf(pan_vsp, " obj = %p {\n", o);
VSB_printf(vsp, " xid = %u,\n", o->xid); VSB_printf(pan_vsp, " xid = %u,\n", o->xid);
pan_ws(o->ws_o, 4); pan_ws(o->ws_o, 4);
pan_http("obj", o->http, 4); pan_http("obj", o->http, 4);
VSB_printf(vsp, " len = %jd,\n", (intmax_t)o->len); VSB_printf(pan_vsp, " len = %jd,\n", (intmax_t)o->len);
VSB_printf(vsp, " store = {\n"); VSB_printf(pan_vsp, " store = {\n");
VTAILQ_FOREACH(st, &o->store, list) VTAILQ_FOREACH(st, &o->store, list)
pan_storage(st); pan_storage(st);
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -181,12 +180,12 @@ pan_vcl(const struct VCL_conf *vcl) ...@@ -181,12 +180,12 @@ pan_vcl(const struct VCL_conf *vcl)
{ {
int i; int i;
VSB_printf(vsp, " vcl = {\n"); VSB_printf(pan_vsp, " vcl = {\n");
VSB_printf(vsp, " srcname = {\n"); VSB_printf(pan_vsp, " srcname = {\n");
for (i = 0; i < vcl->nsrc; ++i) for (i = 0; i < vcl->nsrc; ++i)
VSB_printf(vsp, " \"%s\",\n", vcl->srcname[i]); VSB_printf(pan_vsp, " \"%s\",\n", vcl->srcname[i]);
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
} }
...@@ -196,7 +195,7 @@ static void ...@@ -196,7 +195,7 @@ static void
pan_wrk(const struct worker *wrk) pan_wrk(const struct worker *wrk)
{ {
VSB_printf(vsp, " worker = %p {\n", wrk); VSB_printf(pan_vsp, " worker = %p {\n", wrk);
pan_ws(wrk->ws, 4); pan_ws(wrk->ws, 4);
if (wrk->bereq->ws != NULL) if (wrk->bereq->ws != NULL)
pan_http("bereq", wrk->bereq, 4); pan_http("bereq", wrk->bereq, 4);
...@@ -204,7 +203,7 @@ pan_wrk(const struct worker *wrk) ...@@ -204,7 +203,7 @@ pan_wrk(const struct worker *wrk)
pan_http("beresp", wrk->beresp, 4); pan_http("beresp", wrk->beresp, 4);
if (wrk->resp->ws != NULL) if (wrk->resp->ws != NULL)
pan_http("resp", wrk->resp, 4); pan_http("resp", wrk->resp, 4);
VSB_printf(vsp, " },\n"); VSB_printf(pan_vsp, " },\n");
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -214,11 +213,11 @@ pan_sess(const struct sess *sp) ...@@ -214,11 +213,11 @@ pan_sess(const struct sess *sp)
{ {
const char *stp, *hand; const char *stp, *hand;
VSB_printf(vsp, "sp = %p {\n", sp); VSB_printf(pan_vsp, "sp = %p {\n", sp);
VSB_printf(vsp, VSB_printf(pan_vsp,
" fd = %d, id = %d, xid = %u,\n", " fd = %d, id = %d, xid = %u,\n",
sp->fd, sp->vsl_id & VSL_IDENTMASK, sp->xid); sp->fd, sp->vsl_id & VSL_IDENTMASK, sp->xid);
VSB_printf(vsp, " client = %s %s,\n", VSB_printf(pan_vsp, " client = %s %s,\n",
sp->addr ? sp->addr : "?.?.?.?", sp->addr ? sp->addr : "?.?.?.?",
sp->port ? sp->port : "?"); sp->port ? sp->port : "?");
switch (sp->step) { switch (sp->step) {
...@@ -229,31 +228,31 @@ pan_sess(const struct sess *sp) ...@@ -229,31 +228,31 @@ pan_sess(const struct sess *sp)
} }
hand = VCL_Return_Name(sp->handling); hand = VCL_Return_Name(sp->handling);
if (stp != NULL) if (stp != NULL)
VSB_printf(vsp, " step = %s,\n", stp); VSB_printf(pan_vsp, " step = %s,\n", stp);
else else
VSB_printf(vsp, " step = 0x%x,\n", sp->step); VSB_printf(pan_vsp, " step = 0x%x,\n", sp->step);
if (hand != NULL) if (hand != NULL)
VSB_printf(vsp, " handling = %s,\n", hand); VSB_printf(pan_vsp, " handling = %s,\n", hand);
else else
VSB_printf(vsp, " handling = 0x%x,\n", sp->handling); VSB_printf(pan_vsp, " handling = 0x%x,\n", sp->handling);
if (sp->err_code) if (sp->err_code)
VSB_printf(vsp, VSB_printf(pan_vsp,
" err_code = %d, err_reason = %s,\n", sp->err_code, " err_code = %d, err_reason = %s,\n", sp->err_code,
sp->err_reason ? sp->err_reason : "(null)"); sp->err_reason ? sp->err_reason : "(null)");
VSB_printf(vsp, " restarts = %d, esi_level = %d\n", VSB_printf(pan_vsp, " restarts = %d, esi_level = %d\n",
sp->restarts, sp->esi_level); sp->restarts, sp->esi_level);
VSB_printf(vsp, " flags = "); VSB_printf(pan_vsp, " flags = ");
if (sp->wrk->do_stream) VSB_printf(vsp, " do_stream"); if (sp->wrk->do_stream) VSB_printf(pan_vsp, " do_stream");
if (sp->wrk->do_gzip) VSB_printf(vsp, " do_gzip"); if (sp->wrk->do_gzip) VSB_printf(pan_vsp, " do_gzip");
if (sp->wrk->do_gunzip) VSB_printf(vsp, " do_gunzip"); if (sp->wrk->do_gunzip) VSB_printf(pan_vsp, " do_gunzip");
if (sp->wrk->do_esi) VSB_printf(vsp, " do_esi"); if (sp->wrk->do_esi) VSB_printf(pan_vsp, " do_esi");
if (sp->wrk->do_close) VSB_printf(vsp, " do_close"); if (sp->wrk->do_close) VSB_printf(pan_vsp, " do_close");
if (sp->wrk->is_gzip) VSB_printf(vsp, " is_gzip"); if (sp->wrk->is_gzip) VSB_printf(pan_vsp, " is_gzip");
if (sp->wrk->is_gunzip) VSB_printf(vsp, " is_gunzip"); if (sp->wrk->is_gunzip) VSB_printf(pan_vsp, " is_gunzip");
VSB_printf(vsp, "\n"); VSB_printf(pan_vsp, "\n");
VSB_printf(vsp, " bodystatus = %d\n", sp->wrk->body_status); VSB_printf(pan_vsp, " bodystatus = %d\n", sp->wrk->body_status);
pan_ws(sp->ws, 2); pan_ws(sp->ws, 2);
pan_http("req", sp->http, 2); pan_http("req", sp->http, 2);
...@@ -270,7 +269,7 @@ pan_sess(const struct sess *sp) ...@@ -270,7 +269,7 @@ pan_sess(const struct sess *sp)
if (VALID_OBJ(sp->obj, OBJECT_MAGIC)) if (VALID_OBJ(sp->obj, OBJECT_MAGIC))
pan_object(sp->obj); pan_object(sp->obj);
VSB_printf(vsp, "},\n"); VSB_printf(pan_vsp, "},\n");
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -285,18 +284,19 @@ pan_backtrace(void) ...@@ -285,18 +284,19 @@ pan_backtrace(void)
size = backtrace (array, 10); size = backtrace (array, 10);
if (size == 0) if (size == 0)
return; return;
VSB_printf(vsp, "Backtrace:\n"); VSB_printf(pan_vsp, "Backtrace:\n");
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
VSB_printf (vsp, " "); VSB_printf (pan_vsp, " ");
if (Symbol_Lookup(vsp, array[i]) < 0) { if (Symbol_Lookup(pan_vsp, array[i]) < 0) {
char **strings; char **strings;
strings = backtrace_symbols(&array[i], 1); strings = backtrace_symbols(&array[i], 1);
if (strings != NULL && strings[0] != NULL) if (strings != NULL && strings[0] != NULL)
VSB_printf(vsp, "%p: %s", array[i], strings[0]); VSB_printf(pan_vsp,
"%p: %s", array[i], strings[0]);
else else
VSB_printf(vsp, "%p: (?)", array[i]); VSB_printf(pan_vsp, "%p: (?)", array[i]);
} }
VSB_printf (vsp, "\n"); VSB_printf (pan_vsp, "\n");
} }
} }
...@@ -314,35 +314,35 @@ pan_ic(const char *func, const char *file, int line, const char *cond, ...@@ -314,35 +314,35 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
anyway */ anyway */
switch(xxx) { switch(xxx) {
case 3: case 3:
VSB_printf(vsp, VSB_printf(pan_vsp,
"Wrong turn at %s:%d:\n%s\n", file, line, cond); "Wrong turn at %s:%d:\n%s\n", file, line, cond);
break; break;
case 2: case 2:
VSB_printf(vsp, VSB_printf(pan_vsp,
"Panic from VCL:\n %s\n", cond); "Panic from VCL:\n %s\n", cond);
break; break;
case 1: case 1:
VSB_printf(vsp, VSB_printf(pan_vsp,
"Missing errorhandling code in %s(), %s line %d:\n" "Missing errorhandling code in %s(), %s line %d:\n"
" Condition(%s) not true.", " Condition(%s) not true.",
func, file, line, cond); func, file, line, cond);
break; break;
default: default:
case 0: case 0:
VSB_printf(vsp, VSB_printf(pan_vsp,
"Assert error in %s(), %s line %d:\n" "Assert error in %s(), %s line %d:\n"
" Condition(%s) not true.\n", " Condition(%s) not true.\n",
func, file, line, cond); func, file, line, cond);
break; break;
} }
if (err) if (err)
VSB_printf(vsp, "errno = %d (%s)\n", err, strerror(err)); VSB_printf(pan_vsp, "errno = %d (%s)\n", err, strerror(err));
q = THR_GetName(); q = THR_GetName();
if (q != NULL) if (q != NULL)
VSB_printf(vsp, "thread = (%s)\n", q); VSB_printf(pan_vsp, "thread = (%s)\n", q);
VSB_printf(vsp, "ident = %s,%s\n", VSB_printf(pan_vsp, "ident = %s,%s\n",
VSB_data(vident) + 1, WAIT_GetName()); VSB_data(vident) + 1, WAIT_GetName());
pan_backtrace(); pan_backtrace();
...@@ -352,11 +352,11 @@ pan_ic(const char *func, const char *file, int line, const char *cond, ...@@ -352,11 +352,11 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
if (sp != NULL) if (sp != NULL)
pan_sess(sp); pan_sess(sp);
} }
VSB_printf(vsp, "\n"); VSB_printf(pan_vsp, "\n");
VSB_bcat(vsp, "", 1); /* NUL termination */ VSB_bcat(pan_vsp, "", 1); /* NUL termination */
if (cache_param->diag_bitmap & 0x4000) if (cache_param->diag_bitmap & 0x4000)
(void)fputs(PAN_panicstr, stderr); (void)fputs(heritage.panic_str, stderr);
if (cache_param->diag_bitmap & 0x1000) if (cache_param->diag_bitmap & 0x1000)
exit(4); exit(4);
...@@ -371,9 +371,9 @@ PAN_Init(void) ...@@ -371,9 +371,9 @@ PAN_Init(void)
{ {
VAS_Fail = pan_ic; VAS_Fail = pan_ic;
vsp = &vsps; pan_vsp = &pan_vsp_storage;
AN(PAN_panicstr); AN(heritage.panic_str);
AN(PAN_panicstr_len); AN(heritage.panic_str_len);
AN(VSB_new(vsp, PAN_panicstr, PAN_panicstr_len, AN(VSB_new(pan_vsp, heritage.panic_str, heritage.panic_str_len,
VSB_FIXEDLEN)); VSB_FIXEDLEN));
} }
bin/varnishd/common/common.h
View file @ 0ae79f5e
...@@ -50,8 +50,6 @@ extern pid_t mgt_pid; ...@@ -50,8 +50,6 @@ extern pid_t mgt_pid;
/* mgt_shmem.c */ /* mgt_shmem.c */
#define PAN_CLASS "Panic" #define PAN_CLASS "Panic"
extern char *PAN_panicstr;
extern unsigned PAN_panicstr_len;
/* varnishd.c */ /* varnishd.c */
extern struct vsb *vident; // XXX: -> heritage ? extern struct vsb *vident; // XXX: -> heritage ?
......
bin/varnishd/common/heritage.h
View file @ 0ae79f5e
...@@ -64,6 +64,10 @@ struct heritage { ...@@ -64,6 +64,10 @@ struct heritage {
char *name; char *name;
char identity[1024]; char identity[1024];
char *panic_str;
ssize_t panic_str_len;
}; };
extern struct heritage heritage; extern struct heritage heritage;
......
bin/varnishd/mgt/mgt_child.c
View file @ 0ae79f5e
...@@ -427,10 +427,10 @@ mgt_handle_panicstr(pid_t r) ...@@ -427,10 +427,10 @@ mgt_handle_panicstr(pid_t r)
{ {
char time_str[30]; char time_str[30];
if (PAN_panicstr[0] == '\0') if (heritage.panic_str[0] == '\0')
return; return;
REPORT(LOG_ERR, "Child (%jd) Panic message: %s", REPORT(LOG_ERR, "Child (%jd) Panic message: %s",
(intmax_t)r, PAN_panicstr); (intmax_t)r, heritage.panic_str);
if (child_panic) if (child_panic)
VSB_delete(child_panic); VSB_delete(child_panic);
...@@ -438,7 +438,7 @@ mgt_handle_panicstr(pid_t r) ...@@ -438,7 +438,7 @@ mgt_handle_panicstr(pid_t r)
XXXAN(child_panic); XXXAN(child_panic);
VTIM_format(VTIM_real(), time_str); VTIM_format(VTIM_real(), time_str);
VSB_printf(child_panic, "Last panic at: %s\n", time_str); VSB_printf(child_panic, "Last panic at: %s\n", time_str);
VSB_cat(child_panic, PAN_panicstr); VSB_cat(child_panic, heritage.panic_str);
AZ(VSB_finish(child_panic)); AZ(VSB_finish(child_panic));
} }
......
bin/varnishd/mgt/mgt_shmem.c
View file @ 0ae79f5e
...@@ -215,7 +215,8 @@ mgt_SHM_Init(void) ...@@ -215,7 +215,8 @@ mgt_SHM_Init(void)
AN(heritage.param); AN(heritage.param);
*heritage.param = mgt_param; *heritage.param = mgt_param;
PAN_panicstr_len = 64 * 1024; heritage.panic_str_len = 64 * 1024;
PAN_panicstr = VSM_Alloc(PAN_panicstr_len, PAN_CLASS, "", ""); heritage.panic_str =
AN(PAN_panicstr); VSM_Alloc(heritage.panic_str_len, PAN_CLASS, "", "");
AN(heritage.panic_str);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment