r3739 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-11 08:41:41 +0100 (Wed, 11 Feb 2009)
New Revision: 3739

Modified:
   branches/2.0/varnish-cache/bin/varnishd/mgt_param.c
   branches/2.0/varnish-cache/bin/varnishd/shmlog.c
Log:
Merge r3570: 

Make it possible (at great performance loss) to force straight
time sequencing of shmlog records for debugging purposes.



Modified: branches/2.0/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt_param.c	2009-02-11 07:36:03 UTC (rev 3738)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt_param.c	2009-02-11 07:41:41 UTC (rev 3739)
@@ -745,6 +745,7 @@
 #ifdef HAVE_ABORT2
 		"  0x00008000 - panic to abort2().\n"
 #endif
+		"  0x00010000 - synchronize shmlog.\n"
 		"Use 0x notation and do the bitor in your head :-)\n",
 		0,
 		"0", "bitmap" },

Modified: branches/2.0/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/shmlog.c	2009-02-11 07:36:03 UTC (rev 3738)
+++ branches/2.0/varnish-cache/bin/varnishd/shmlog.c	2009-02-11 07:41:41 UTC (rev 3739)
@@ -231,6 +231,8 @@
 	memcpy(p + SHMLOG_DATA, t.b, l);
 	vsl_hdr(tag, p, l, id);
 	w->wlr++;
+	if (params->diag_bitmap & 0x10000)
+		WSL_Flush(w, 0);
 }
 
 /*--------------------------------------------------------------------*/
@@ -269,6 +271,8 @@
 		w->wlr++;
 	}
 	va_end(ap);
+	if (params->diag_bitmap & 0x10000)
+		WSL_Flush(w, 0);
 }
 
 /*--------------------------------------------------------------------*/