[master] 110d073 Add a vsl_catchup varnishtest function

[Martin Blix Grydeland]

commit 110d0732d4ba6a6bfb082994f632b837490a7e9b
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Mar 22 18:09:12 2017 +0100

    Add a vsl_catchup varnishtest function
    
    This enables waiting for the logging thread to idle to make sure all
    generated log is caught.

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 154952e..eb42078 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -82,6 +82,7 @@ struct varnish {
 	unsigned		vsl_tag_count[256];
 
 	volatile int		vsl_rec;
+	volatile int		vsl_idle;
 };
 
 #define NONSENSE	"%XJEIFLH|)Xspa8P"
@@ -182,6 +183,16 @@ wait_running(const struct varnish *v)
  * Varnishlog gatherer thread
  */
 
+static void
+vsl_catchup(const struct varnish *v)
+{
+	int vsl_idle;
+
+	vsl_idle = v->vsl_idle;
+	while (vsl_idle == v->vsl_idle)
+		VTIM_sleep(0.1);
+}
+
 static void *
 varnishlog_thread(void *priv)
 {
@@ -249,6 +260,7 @@ varnishlog_thread(void *priv)
 		}
 		if (i == 0) {
 			/* Nothing to do but wait */
+			v->vsl_idle++;
 			VTIM_sleep(0.1);
 		} else if (i == -2) {
 			/* Abandoned - try reconnect */
@@ -1054,6 +1066,10 @@ varnish_expect(const struct varnish *v, char * const *av)
  *         style pattern (ie: fnmatch(3)) as used in shell filename expansion.
  *         To see all counters use pattern "*", to see all counters about
  *         requests use "*req*".
+ *
+ * \-vsl_catchup
+ *         Wait until the logging thread has idled to make sure that all
+ *         the generated log is flushed
  */
 
 void
@@ -1209,6 +1225,10 @@ cmd_varnish(CMD_ARGS)
 			varnish_wait(v);
 			continue;
 		}
+		if (!strcmp(*av, "-vsl_catchup")) {
+			vsl_catchup(v);
+			continue;
+		}
 		vtc_fatal(v->vl, "Unknown varnish argument: %s", *av);
 	}
 }