r2221 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 15:41:11 +0100 (Tue, 30 Oct 2007)
New Revision: 2221

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_center.c
Log:
Merged revisions 2220 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2220 | des | 2007-10-30 15:40:55 +0100 (Tue, 30 Oct 2007) | 5 lines
  
  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.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220

Modified: branches/1.2/bin/varnishd/cache_center.c
===================================================================
--- branches/1.2/bin/varnishd/cache_center.c	2007-10-30 14:40:55 UTC (rev 2220)
+++ branches/1.2/bin/varnishd/cache_center.c	2007-10-30 14:41:11 UTC (rev 2221)
@@ -869,10 +869,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