r2237 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-11-08 22:23:48 +0100 (Thu, 08 Nov 2007)
New Revision: 2237

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

........
  r2215 | des | 2007-10-30 15:06:37 +0100 (Tue, 30 Oct 2007) | 3 lines
  
  When DIAGNOSTICS is defined, log every step that each session goes through,
  along with some vital statistics, and flush the log regularly.
........
  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.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212,2215-2220

Modified: branches/1.1/bin/varnishd/cache_center.c
===================================================================
--- branches/1.1/bin/varnishd/cache_center.c	2007-11-08 21:23:27 UTC (rev 2236)
+++ branches/1.1/bin/varnishd/cache_center.c	2007-11-08 21:23:48 UTC (rev 2237)
@@ -783,7 +783,22 @@
 			CHECK_OBJ(w->nobjhead, OBJHEAD_MAGIC);
 
 		switch (sp->step) {
-#define STEP(l,u) case STP_##u: done = cnt_##l(sp); break;
+#ifdef DIAGNOSTICS
+#define STEP(l,u) \
+		    case STP_##u: \
+			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
+#define STEP(l,u) \
+		    case STP_##u: \
+			done = cnt_##l(sp); \
+		        break;
+#endif
 #include "steps.h"
 #undef STEP
 		default:	INCOMPL();