r5517 - trunk/varnish-cache/bin/varnishtest

[phk at varnish-cache.org]

Author: phk
Date: 2010-11-05 13:38:22 +0100 (Fri, 05 Nov 2010)
New Revision: 5517

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_main.c
Log:
Avoid using minherit(2), most OS's are still not in the 1990'es with
VM interfaces.

Fix an assert to be correct.




Modified: trunk/varnish-cache/bin/varnishtest/vtc_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_main.c	2010-11-05 00:03:52 UTC (rev 5516)
+++ trunk/varnish-cache/bin/varnishtest/vtc_main.c	2010-11-05 12:38:22 UTC (rev 5517)
@@ -148,7 +148,7 @@
 		jp->evt = NULL;
 		return (1);
 	}
-	assert(what & EV_RD);
+	assert(what & (EV_RD | EV_HUP));
 
 	*buf = '\0';
 	i = read(ve->fd, buf, sizeof buf - 1);
@@ -208,12 +208,11 @@
 
 	jp->bufsiz = 64*1024;		/* XXX */
 
-	jp->buf = mmap(NULL, jp->bufsiz, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
+	jp->buf = mmap(NULL, jp->bufsiz, PROT_READ|PROT_WRITE,
+	    MAP_ANON | MAP_SHARED, -1, 0);
 	assert(jp->buf != MAP_FAILED);
 	memset(jp->buf, 0, jp->bufsiz);
 
-	AZ(minherit(jp->buf, jp->bufsiz, INHERIT_SHARE));
-
 	tp = VTAILQ_FIRST(&tst_head);
 	CHECK_OBJ_NOTNULL(tp, TST_MAGIC);
 	AN(tp->ntodo);
@@ -241,7 +240,6 @@
 		_exit(retval);
 	}
 	AZ(close(p[1]));
-	AZ(minherit(jp->buf, jp->bufsiz, INHERIT_NONE));
 
 	jp->ev = vev_new();
 	AN(jp->ev);