r2556 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-03-07 11:36:40 +0100 (Fri, 07 Mar 2008)
New Revision: 2556

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Put waiting list shmlogs under diag_bitmap


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2008-03-05 13:18:39 UTC (rev 2555)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2008-03-07 10:36:40 UTC (rev 2556)
@@ -550,7 +550,9 @@
 		 * 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

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2008-03-05 13:18:39 UTC (rev 2555)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2008-03-07 10:36:40 UTC (rev 2556)
@@ -278,7 +278,8 @@
 		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);
 	}
 }

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-03-05 13:18:39 UTC (rev 2555)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-03-07 10:36:40 UTC (rev 2556)
@@ -643,6 +643,7 @@
 		"  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" },