Put waiting list shmlogs under diag_bitmap

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2556 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index 01ed8bb7c3e2788c222677c395cd88793c789302..bb686de2ab125adb5a04eb9abb5ca70f9959ace7 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -550,7 +550,9 @@ cnt_lookup(struct sess *sp)
                 * hash code to restart us, still in STP_LOOKUP, later.
                 */
                spassert(sp->objhead != NULL);
-               WSP(sp, SLT_Debug, "on waiting list <%s>", sp->objhead->hash);
+               if (params->diag_bitmap & 0x20)
+                       WSP(sp, SLT_Debug,
+                           "on waiting list <%s>", sp->objhead->hash);
                /*
                 * There is a non-zero risk that we come here more than once
                 * before we get through, in that case cnt_recv must be set

diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index 2efc1627cc9985d71dd64f29169b08c2ab24142c..f18c51db77724ecab0a5f1600e0dfd2e1ec7956f 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -278,7 +278,8 @@ hsh_rush(struct objhead *oh)
                if (sp == NULL)
                        return;
                VTAILQ_REMOVE(&oh->waitinglist, sp, list);
-               VSL(SLT_Debug, sp->id, "of waiting list");
+               if (params->diag_bitmap & 0x20)
+                       VSL(SLT_Debug, sp->id, "off waiting list");
                WRK_QueueSession(sp);
        }
 }

diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c
index 2861861bd7fb8500de8e63a41101a48faae1aeee..8b6edac0e6ca30a0056612718479fd6a888d4b77 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_param.c
+++ b/varnish-cache/bin/varnishd/mgt_param.c
@@ -643,6 +643,7 @@ static const struct parspec parspec[] = {
                "  0x00000004 - kqueue debugging.\n"
                "  0x00000008 - mutex logging.\n"
                "  0x00000010 - mutex contests.\n"
+               "  0x00000020 - waiting list.\n"
                "Use 0x notation and do the bitor in your head :-)\n",
                0,
                "0", "bitmap" },