r2220 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 15:40:55 +0100 (Tue, 30 Oct 2007)
New Revision: 2220

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
Refine the debugging string: we don't really need the XID, but we do need
the thread ID in order to locate the correct thread in gdb.  Furthermore,
we must use VSL rather than WSL since the session might actually not have
a worker at that point; but if it does, make sure to flush the log first.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-30 14:09:49 UTC (rev 2219)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-30 14:40:55 UTC (rev 2220)
@@ -880,10 +880,11 @@
 #ifdef DIAGNOSTICS
 #define STEP(l,u) \
 		    case STP_##u: \
-			WSL(sp->wrk, SLT_Debug, sp->id, \
-			    "cnt_%s(%p) xid %x obj %p vcl %p", \
-			    #l, sp, sp->xid, sp->obj, sp->vcl);	\
-			WSL_Flush(sp->wrk); \
+			if (sp->wrk) \
+				WSL_Flush(sp->wrk); \
+			VSL(SLT_Debug, sp->id, \
+			    "thr %p STP_%s sp %p obj %p vcl %p", \
+			    pthread_self(), #u, sp, sp->obj, sp->vcl); \
 			done = cnt_##l(sp); \
 			break;
 #else