[master] 37f565d in workspace panic info, use +0 offset output for {f, r, e} == s also

Nils Goroll nils.goroll at uplex.de
Wed Nov 9 14:46:05 CET 2016


commit 37f565ddb28d9ba04fa705030540fcb636911892
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 9 14:31:20 2016 +0100

    in workspace panic info, use +0 offset output for {f, r, e} == s also

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 69edef8..1685d61 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -163,15 +163,15 @@ pan_ws(struct vsb *vsb, const struct ws *ws)
 		VSB_printf(vsb, "OVERFLOWED ");
 	VSB_printf(vsb, "id = \"%s\",\n", ws->id);
 	VSB_printf(vsb, "{s, f, r, e} = {%p", ws->s);
-	if (ws->f > ws->s)
+	if (ws->f >= ws->s)
 		VSB_printf(vsb, ", +%ld", (long) (ws->f - ws->s));
 	else
 		VSB_printf(vsb, ", %p", ws->f);
-	if (ws->r > ws->s)
+	if (ws->r >= ws->s)
 		VSB_printf(vsb, ", +%ld", (long) (ws->r - ws->s));
 	else
 		VSB_printf(vsb, ", %p", ws->r);
-	if (ws->e > ws->s)
+	if (ws->e >= ws->s)
 		VSB_printf(vsb, ", +%ld", (long) (ws->e - ws->s));
 	else
 		VSB_printf(vsb, ", %p", ws->e);



More information about the varnish-commit mailing list