From martin at varnish-cache.org  Thu Dec  1 11:58:17 2011
From: martin at varnish-cache.org (Martin Blix Grydeland)
Date: Thu, 01 Dec 2011 12:58:17 +0100
Subject: [master] ecd8f53 Only call pan_busyobj when we have a busyobj
Message-ID: <E1RW5HN-0004On-4Y@project.varnish-software.com>

commit ecd8f535d8add7fc1a02f0b041939099a6183fa3
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Dec 1 12:51:26 2011 +0100

    Only call pan_busyobj when we have a busyobj

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 0908b74..cf39489 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -259,7 +259,8 @@ pan_sess(const struct sess *sp)
 	VSB_printf(pan_vsp, "  restarts = %d, esi_level = %d\n",
 	    sp->restarts, sp->esi_level);
 
-	pan_busyobj(sp->wrk->busyobj);
+	if (sp->wrk->busyobj != NULL)
+		pan_busyobj(sp->wrk->busyobj);
 
 	pan_ws(sp->ws, 2);
 	pan_http("req", sp->http, 2);



From martin at varnish-cache.org  Thu Dec  1 11:58:17 2011
From: martin at varnish-cache.org (Martin Blix Grydeland)
Date: Thu, 01 Dec 2011 12:58:17 +0100
Subject: [master] 9a5b477 Correct indent level of closing bracket in pan_wrk()
Message-ID: <E1RW5HN-0004Ot-N9@project.varnish-software.com>

commit 9a5b4779043aa90af7d5b5f4a13d6e34f787ecb5
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Dec 1 12:53:51 2011 +0100

    Correct indent level of closing bracket in pan_wrk()

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index cf39489..798ba53 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -203,7 +203,7 @@ pan_wrk(const struct worker *wrk)
 		pan_http("beresp", wrk->beresp, 4);
 	if (wrk->resp->ws != NULL)
 		pan_http("resp", wrk->resp, 4);
-	VSB_printf(pan_vsp, "    },\n");
+	VSB_printf(pan_vsp, "  },\n");
 }
 
 static void



From phk at varnish-cache.org  Mon Dec  5 08:34:44 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 09:34:44 +0100
Subject: [master] 9633e66 Led VDI_CloseFd() take an the vbc to be closed as
	argument.
Message-ID: <E1RXU0a-000242-C8@project.varnish-software.com>

commit 9633e660b238f3456baa004caf58a10e1403cb41
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 08:34:27 2011 +0000

    Led VDI_CloseFd() take an the vbc to be closed as argument.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ff9dcea..4cfad78 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -650,7 +650,7 @@ void VBE_UseHealth(const struct director *vdi);
 
 struct vbc *VDI_GetFd(const struct director *, struct sess *sp);
 int VDI_Healthy(const struct director *, const struct sess *sp);
-void VDI_CloseFd(struct worker *wrk);
+void VDI_CloseFd(struct worker *wrk, struct vbc **vbp);
 void VDI_RecycleFd(struct worker *wrk);
 void VDI_AddHostHeader(const struct sess *sp);
 void VBE_Poll(void);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 501293d..997ecac 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -249,7 +249,7 @@ cnt_prepresp(struct sess *sp)
 		if (sp->restarts >= cache_param->max_restarts)
 			break;
 		if (wrk->busyobj->do_stream) {
-			VDI_CloseFd(wrk);
+			VDI_CloseFd(wrk, &wrk->vbc);
 			HSH_Drop(wrk);
 		} else {
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
@@ -633,7 +633,7 @@ cnt_fetch(struct sess *sp)
 		}
 
 		/* We are not going to fetch the body, Close the connection */
-		VDI_CloseFd(wrk);
+		VDI_CloseFd(wrk, &wrk->vbc);
 	}
 
 	/* Clean up partial fetch */
@@ -817,7 +817,7 @@ cnt_fetchbody(struct sess *sp)
 	if (wrk->obj == NULL) {
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
-		VDI_CloseFd(wrk);
+		VDI_CloseFd(wrk, &wrk->vbc);
 		return (0);
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index eba6183..434277e 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -40,27 +40,31 @@
 /* Close a connection ------------------------------------------------*/
 
 void
-VDI_CloseFd(struct worker *wrk)
+VDI_CloseFd(struct worker *wrk, struct vbc **vbp)
 {
 	struct backend *bp;
+	struct vbc *vc;
 
-	CHECK_OBJ_NOTNULL(wrk->vbc, VBC_MAGIC);
-	CHECK_OBJ_NOTNULL(wrk->vbc->backend, BACKEND_MAGIC);
-	assert(wrk->vbc->fd >= 0);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	AN(vbp);
+	vc = *vbp;
+	*vbp = NULL;
+	CHECK_OBJ_NOTNULL(vc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(vc->backend, BACKEND_MAGIC);
+	assert(vc->fd >= 0);
 
-	bp = wrk->vbc->backend;
+	bp = vc->backend;
 
-	WSL(wrk, SLT_BackendClose, wrk->vbc->vsl_id, "%s", bp->display_name);
+	WSL(wrk, SLT_BackendClose, vc->vsl_id, "%s", bp->display_name);
 
 	/* Checkpoint log to flush all info related to this connection
 	   before the OS reuses the FD */
 	WSL_Flush(wrk, 0);
 
-	VTCP_close(&wrk->vbc->fd);
+	VTCP_close(&vc->fd);
 	VBE_DropRefConn(bp);
-	wrk->vbc->backend = NULL;
-	VBE_ReleaseConn(wrk->vbc);
-	wrk->vbc = NULL;
+	vc->backend = NULL;
+	VBE_ReleaseConn(vc);
 }
 
 /* Recycle a connection ----------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 38a2cf3..1d4eff3 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -427,7 +427,7 @@ FetchHdr(struct sess *sp)
 	if (WRW_FlushRelease(w) || i > 0) {
 		WSP(sp, SLT_FetchError, "backend write error: %d (%s)",
 		    errno, strerror(errno));
-		VDI_CloseFd(sp->wrk);
+		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 		/* XXX: other cleanup ? */
 		return (retry);
 	}
@@ -451,7 +451,7 @@ FetchHdr(struct sess *sp)
 	if (i < 0) {
 		WSP(sp, SLT_FetchError, "http first read error: %d %d (%s)",
 		    i, errno, strerror(errno));
-		VDI_CloseFd(sp->wrk);
+		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 		/* XXX: other cleanup ? */
 		/* Retryable if we never received anything */
 		return (i == -1 ? retry : -1);
@@ -465,7 +465,7 @@ FetchHdr(struct sess *sp)
 			WSP(sp, SLT_FetchError,
 			    "http first read error: %d %d (%s)",
 			    i, errno, strerror(errno));
-			VDI_CloseFd(sp->wrk);
+			VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 			/* XXX: other cleanup ? */
 			return (-1);
 		}
@@ -475,7 +475,7 @@ FetchHdr(struct sess *sp)
 
 	if (http_DissectResponse(w, htc, hp)) {
 		WSP(sp, SLT_FetchError, "http format error");
-		VDI_CloseFd(sp->wrk);
+		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 		/* XXX: other cleanup ? */
 		return (-1);
 	}
@@ -571,7 +571,7 @@ FetchBody(struct worker *w, struct object *obj)
 	    cls, mklen);
 
 	if (w->busyobj->body_status == BS_ERROR) {
-		VDI_CloseFd(w);
+		VDI_CloseFd(w, &w->vbc);
 		return (__LINE__);
 	}
 
@@ -583,7 +583,7 @@ FetchBody(struct worker *w, struct object *obj)
 			VTAILQ_REMOVE(&obj->store, st, list);
 			STV_free(st);
 		}
-		VDI_CloseFd(w);
+		VDI_CloseFd(w, &w->vbc);
 		obj->len = 0;
 		return (__LINE__);
 	}
@@ -616,7 +616,7 @@ FetchBody(struct worker *w, struct object *obj)
 	}
 
 	if (cls)
-		VDI_CloseFd(w);
+		VDI_CloseFd(w, &w->vbc);
 	else
 		VDI_RecycleFd(w);
 
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 4180d39..9bf8b79 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -89,7 +89,7 @@ PipeSession(struct sess *sp)
 
 	if (i) {
 		SES_Close(sp, "pipe");
-		VDI_CloseFd(sp->wrk);
+		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 		return;
 	}
 
@@ -129,5 +129,5 @@ PipeSession(struct sess *sp)
 		}
 	}
 	SES_Close(sp, "pipe");
-	VDI_CloseFd(sp->wrk);
+	VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
 }



From phk at varnish-cache.org  Mon Dec  5 08:49:35 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 09:49:35 +0100
Subject: [master] 5ec8dea Give pipe its own local vbc.
Message-ID: <E1RXUEx-0003yZ-2u@project.varnish-software.com>

commit 5ec8dead4585d87ff8742342cdf34cd4aa947eaf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 08:49:20 2011 +0000

    Give pipe its own local vbc.

diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 9bf8b79..5337eda 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -71,10 +71,9 @@ PipeSession(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
 	w = sp->wrk;
 
-	sp->wrk->vbc = VDI_GetFd(NULL, sp);
-	if (sp->wrk->vbc == NULL)
+	vc = VDI_GetFd(NULL, sp);
+	if (vc == NULL)
 		return;
-	vc = sp->wrk->vbc;
 	(void)VTCP_blocking(vc->fd);
 
 	WRW_Reserve(w, &vc->fd);
@@ -89,7 +88,7 @@ PipeSession(struct sess *sp)
 
 	if (i) {
 		SES_Close(sp, "pipe");
-		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+		VDI_CloseFd(sp->wrk, &vc);
 		return;
 	}
 
@@ -129,5 +128,5 @@ PipeSession(struct sess *sp)
 		}
 	}
 	SES_Close(sp, "pipe");
-	VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+	VDI_CloseFd(sp->wrk, &vc);
 }



From phk at varnish-cache.org  Mon Dec  5 09:10:46 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 10:10:46 +0100
Subject: [master] 7e11625 Use correct vsl_id.
Message-ID: <E1RXUZS-0006Od-Oh@project.varnish-software.com>

commit 7e11625e27494bb91f9129a99709d855c2ba469f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 09:10:33 2011 +0000

    Use correct vsl_id.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index de4318f..a435c1c 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -66,7 +66,7 @@ VDI_AddHostHeader(const struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp->wrk->bereq, HTTP_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk->vbc, VBC_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk->vbc->vdis, VDI_SIMPLE_MAGIC);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->bereq,
+	http_PrintfHeader(sp->wrk, sp->wrk->vbc->vsl_id, sp->wrk->bereq,
 	    "Host: %s", sp->wrk->vbc->vdis->vrt->hosthdr);
 }
 



From phk at varnish-cache.org  Mon Dec  5 13:06:55 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 14:06:55 +0100
Subject: [master] e91fe76 Fix a buglet where we could send one backends Host:
	header to another backend under very rare circumstances.
Message-ID: <E1RXYFz-000506-6D@project.varnish-software.com>

commit e91fe766effc59fc42bbde821b69552c086c60f3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 13:06:28 2011 +0000

    Fix a buglet where we could send one backends Host: header to another
    backend under very rare circumstances.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 4cfad78..05aaf39 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -712,7 +712,7 @@ int EXP_NukeOne(struct worker *w, struct lru *lru);
 struct storage *FetchStorage(struct worker *w, ssize_t sz);
 int FetchError(struct worker *w, const char *error);
 int FetchError2(struct worker *w, const char *error, const char *more);
-int FetchHdr(struct sess *sp);
+int FetchHdr(struct sess *sp, int need_host_hdr);
 int FetchBody(struct worker *w, struct object *obj);
 int FetchReqBody(struct sess *sp);
 void Fetch_Init(void);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 997ecac..d2126ba 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -554,7 +554,7 @@ DOT errfetch [label="ERROR",shape=plaintext]
 static int
 cnt_fetch(struct sess *sp)
 {
-	int i;
+	int i, need_host_hdr;
 	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
@@ -571,7 +571,9 @@ cnt_fetch(struct sess *sp)
 
 	http_Setup(wrk->beresp, wrk->ws);
 
-	i = FetchHdr(sp);
+	need_host_hdr = !http_GetHdr(wrk->bereq, H_Host, NULL);
+
+	i = FetchHdr(sp, need_host_hdr);
 	/*
 	 * If we recycle a backend connection, there is a finite chance
 	 * that the backend closed it before we get a request to it.
@@ -579,7 +581,7 @@ cnt_fetch(struct sess *sp)
 	 */
 	if (i == 1) {
 		VSC_C_main->backend_retry++;
-		i = FetchHdr(sp);
+		i = FetchHdr(sp, need_host_hdr);
 	}
 
 	if (i) {
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 1d4eff3..7d8763f 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -375,11 +375,10 @@ FetchReqBody(struct sess *sp)
  */
 
 int
-FetchHdr(struct sess *sp)
+FetchHdr(struct sess *sp, int need_host_hdr)
 {
 	struct vbc *vc;
 	struct worker *w;
-	char *b;
 	struct http *hp;
 	int retry = -1;
 	int i;
@@ -415,7 +414,7 @@ FetchHdr(struct sess *sp)
 	 * header if one is necessary.  This cannot be done in the VCL
 	 * because the backend may be chosen by a director.
 	 */
-	if (!http_GetHdr(hp, H_Host, &b))
+	if (need_host_hdr)
 		VDI_AddHostHeader(sp);
 
 	(void)VTCP_blocking(vc->fd);	/* XXX: we should timeout instead */



From phk at varnish-cache.org  Mon Dec  5 13:43:51 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 14:43:51 +0100
Subject: [master] e4c002c Make VDI_RecycleFd() take a pointer to the vbc to
	recycle.
Message-ID: <E1RXYpj-000116-Cj@project.varnish-software.com>

commit e4c002c41096468083fddef3a47e6b5c49577744
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 13:28:20 2011 +0000

    Make VDI_RecycleFd() take a pointer to the vbc to recycle.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 05aaf39..4cc356e 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -651,7 +651,7 @@ void VBE_UseHealth(const struct director *vdi);
 struct vbc *VDI_GetFd(const struct director *, struct sess *sp);
 int VDI_Healthy(const struct director *, const struct sess *sp);
 void VDI_CloseFd(struct worker *wrk, struct vbc **vbp);
-void VDI_RecycleFd(struct worker *wrk);
+void VDI_RecycleFd(struct worker *wrk, struct vbc **vbp);
 void VDI_AddHostHeader(const struct sess *sp);
 void VBE_Poll(void);
 
diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index 434277e..5902ce8 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -70,17 +70,22 @@ VDI_CloseFd(struct worker *wrk, struct vbc **vbp)
 /* Recycle a connection ----------------------------------------------*/
 
 void
-VDI_RecycleFd(struct worker *wrk)
+VDI_RecycleFd(struct worker *wrk, struct vbc **vbp)
 {
 	struct backend *bp;
+	struct vbc *vc;
 
-	CHECK_OBJ_NOTNULL(wrk->vbc, VBC_MAGIC);
-	CHECK_OBJ_NOTNULL(wrk->vbc->backend, BACKEND_MAGIC);
-	assert(wrk->vbc->fd >= 0);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	AN(vbp);
+	vc = *vbp;
+	*vbp = NULL;
+	CHECK_OBJ_NOTNULL(vc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(vc->backend, BACKEND_MAGIC);
+	assert(vc->fd >= 0);
 
-	bp = wrk->vbc->backend;
+	bp = vc->backend;
 
-	WSL(wrk, SLT_BackendReuse, wrk->vbc->vsl_id, "%s", bp->display_name);
+	WSL(wrk, SLT_BackendReuse, vc->vsl_id, "%s", bp->display_name);
 	/*
 	 * Flush the shmlog, so that another session reusing this backend
 	 * will log chronologically later than our use of it.
@@ -88,8 +93,7 @@ VDI_RecycleFd(struct worker *wrk)
 	WSL_Flush(wrk, 0);
 	Lck_Lock(&bp->mtx);
 	VSC_C_main->backend_recycle++;
-	VTAILQ_INSERT_HEAD(&bp->connlist, wrk->vbc, list);
-	wrk->vbc = NULL;
+	VTAILQ_INSERT_HEAD(&bp->connlist, vc, list);
 	VBE_DropRefLocked(bp);
 }
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 7d8763f..d321d7a 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -617,7 +617,7 @@ FetchBody(struct worker *w, struct object *obj)
 	if (cls)
 		VDI_CloseFd(w, &w->vbc);
 	else
-		VDI_RecycleFd(w);
+		VDI_RecycleFd(w, &w->vbc);
 
 	return (0);
 }



From phk at varnish-cache.org  Mon Dec  5 13:43:53 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 14:43:53 +0100
Subject: [master] 9cb9ba6 Move vbc from worker to busyobj
Message-ID: <E1RXYpl-00011C-PH@project.varnish-software.com>

commit 9cb9ba6f6dbf4a3f9136f8b145c80be0d26418a9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 13:43:38 2011 +0000

    Move vbc from worker to busyobj

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 4cc356e..46af4dd 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -330,7 +330,6 @@ struct worker {
 	/* Fetch stuff.  Here because pipe has no busyobj */
 	struct http		*bereq;
 	struct http		*beresp;
-	struct vbc		*vbc;
 
 	/* Stream state */
 	struct stream_ctx	*sctx;
@@ -494,6 +493,7 @@ struct busyobj {
 	unsigned		fetch_failed;
 	struct vgz		*vgz_rx;
 
+	struct vbc		*vbc;
 	struct object		*fetch_obj;
 	struct exp		exp;
 	struct http_conn	htc;
@@ -652,7 +652,7 @@ struct vbc *VDI_GetFd(const struct director *, struct sess *sp);
 int VDI_Healthy(const struct director *, const struct sess *sp);
 void VDI_CloseFd(struct worker *wrk, struct vbc **vbp);
 void VDI_RecycleFd(struct worker *wrk, struct vbc **vbp);
-void VDI_AddHostHeader(const struct sess *sp);
+void VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc);
 void VBE_Poll(void);
 
 /* cache_backend_cfg.c */
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index a435c1c..b661640 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -59,15 +59,15 @@ struct vdi_simple {
  * Create default Host: header for backend request
  */
 void
-VDI_AddHostHeader(const struct sess *sp)
+VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc)
 {
 
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->bereq, HTTP_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->vbc, VBC_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->vbc->vdis, VDI_SIMPLE_MAGIC);
-	http_PrintfHeader(sp->wrk, sp->wrk->vbc->vsl_id, sp->wrk->bereq,
-	    "Host: %s", sp->wrk->vbc->vdis->vrt->hosthdr);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->bereq, HTTP_MAGIC);
+	CHECK_OBJ_NOTNULL(vbc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(vbc->vdis, VDI_SIMPLE_MAGIC);
+	http_PrintfHeader(wrk, vbc->vsl_id, wrk->bereq,
+	    "Host: %s", vbc->vdis->vrt->hosthdr);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index d2126ba..079df44 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -249,7 +249,7 @@ cnt_prepresp(struct sess *sp)
 		if (sp->restarts >= cache_param->max_restarts)
 			break;
 		if (wrk->busyobj->do_stream) {
-			VDI_CloseFd(wrk, &wrk->vbc);
+			VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 			HSH_Drop(wrk);
 		} else {
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
@@ -338,7 +338,6 @@ cnt_done(struct sess *sp)
 	CHECK_OBJ_ORNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
-	AZ(wrk->vbc);
 	sp->director = NULL;
 	sp->restarts = 0;
 
@@ -565,7 +564,7 @@ cnt_fetch(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
 	AN(sp->director);
-	AZ(wrk->vbc);
+	AZ(wrk->busyobj->vbc);
 	AZ(wrk->busyobj->should_close);
 	AZ(wrk->storage_hint);
 
@@ -635,11 +634,11 @@ cnt_fetch(struct sess *sp)
 		}
 
 		/* We are not going to fetch the body, Close the connection */
-		VDI_CloseFd(wrk, &wrk->vbc);
+		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 	}
 
 	/* Clean up partial fetch */
-	AZ(wrk->vbc);
+	AZ(wrk->busyobj->vbc);
 
 	if (wrk->objcore != NULL) {
 		CHECK_OBJ_NOTNULL(wrk->objcore, OBJCORE_MAGIC);
@@ -819,7 +818,7 @@ cnt_fetchbody(struct sess *sp)
 	if (wrk->obj == NULL) {
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
-		VDI_CloseFd(wrk, &wrk->vbc);
+		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 		return (0);
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
@@ -883,7 +882,7 @@ cnt_fetchbody(struct sess *sp)
 	http_Setup(wrk->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
 	assert(WRW_IsReleased(wrk));
-	AZ(wrk->vbc);
+	AZ(wrk->busyobj->vbc);
 	AN(sp->director);
 
 	if (i) {
@@ -950,7 +949,7 @@ cnt_streambody(struct sess *sp)
 	http_Setup(wrk->bereq, NULL);
 	http_Setup(wrk->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
-	AZ(wrk->vbc);
+	AZ(wrk->busyobj->vbc);
 	AN(sp->director);
 
 	if (!i && wrk->obj->objcore != NULL) {
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index d321d7a..6483a99 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -400,12 +400,12 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 
 	hp = w->bereq;
 
-	sp->wrk->vbc = VDI_GetFd(NULL, sp);
-	if (sp->wrk->vbc == NULL) {
+	sp->wrk->busyobj->vbc = VDI_GetFd(NULL, sp);
+	if (sp->wrk->busyobj->vbc == NULL) {
 		WSP(sp, SLT_FetchError, "no backend connection");
 		return (-1);
 	}
-	vc = sp->wrk->vbc;
+	vc = sp->wrk->busyobj->vbc;
 	if (vc->recycled)
 		retry = 1;
 
@@ -415,7 +415,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	 * because the backend may be chosen by a director.
 	 */
 	if (need_host_hdr)
-		VDI_AddHostHeader(sp);
+		VDI_AddHostHeader(sp->wrk, vc);
 
 	(void)VTCP_blocking(vc->fd);	/* XXX: we should timeout instead */
 	WRW_Reserve(w, &vc->fd);
@@ -426,7 +426,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	if (WRW_FlushRelease(w) || i > 0) {
 		WSP(sp, SLT_FetchError, "backend write error: %d (%s)",
 		    errno, strerror(errno));
-		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+		VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
 		/* XXX: other cleanup ? */
 		return (retry);
 	}
@@ -450,7 +450,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	if (i < 0) {
 		WSP(sp, SLT_FetchError, "http first read error: %d %d (%s)",
 		    i, errno, strerror(errno));
-		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+		VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
 		/* XXX: other cleanup ? */
 		/* Retryable if we never received anything */
 		return (i == -1 ? retry : -1);
@@ -464,7 +464,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 			WSP(sp, SLT_FetchError,
 			    "http first read error: %d %d (%s)",
 			    i, errno, strerror(errno));
-			VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+			VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
 			/* XXX: other cleanup ? */
 			return (-1);
 		}
@@ -474,7 +474,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 
 	if (http_DissectResponse(w, htc, hp)) {
 		WSP(sp, SLT_FetchError, "http format error");
-		VDI_CloseFd(sp->wrk, &sp->wrk->vbc);
+		VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
 		/* XXX: other cleanup ? */
 		return (-1);
 	}
@@ -495,7 +495,7 @@ FetchBody(struct worker *w, struct object *obj)
 	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
 	AZ(w->busyobj->fetch_obj);
-	CHECK_OBJ_NOTNULL(w->vbc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(w->busyobj->vbc, VBC_MAGIC);
 	CHECK_OBJ_NOTNULL(obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(obj->http, HTTP_MAGIC);
 
@@ -570,7 +570,7 @@ FetchBody(struct worker *w, struct object *obj)
 	    cls, mklen);
 
 	if (w->busyobj->body_status == BS_ERROR) {
-		VDI_CloseFd(w, &w->vbc);
+		VDI_CloseFd(w, &w->busyobj->vbc);
 		return (__LINE__);
 	}
 
@@ -582,7 +582,7 @@ FetchBody(struct worker *w, struct object *obj)
 			VTAILQ_REMOVE(&obj->store, st, list);
 			STV_free(st);
 		}
-		VDI_CloseFd(w, &w->vbc);
+		VDI_CloseFd(w, &w->busyobj->vbc);
 		obj->len = 0;
 		return (__LINE__);
 	}
@@ -610,14 +610,14 @@ FetchBody(struct worker *w, struct object *obj)
 
 	if (mklen > 0) {
 		http_Unset(obj->http, H_Content_Length);
-		http_PrintfHeader(w, w->vbc->vsl_id, obj->http,
+		http_PrintfHeader(w, w->busyobj->vbc->vsl_id, obj->http,
 		    "Content-Length: %jd", (intmax_t)obj->len);
 	}
 
 	if (cls)
-		VDI_CloseFd(w, &w->vbc);
+		VDI_CloseFd(w, &w->busyobj->vbc);
 	else
-		VDI_RecycleFd(w, &w->vbc);
+		VDI_RecycleFd(w, &w->busyobj->vbc);
 
 	return (0);
 }
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 798ba53..923abbd 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -220,6 +220,9 @@ pan_busyobj(const struct busyobj *bo)
 	if (bo->should_close)	VSB_printf(pan_vsp, "    should_close\n");
 	VSB_printf(pan_vsp, "    bodystatus = %d,\n", bo->body_status);
 	VSB_printf(pan_vsp, "    },\n");
+	if (VALID_OBJ(bo->vbc, BACKEND_MAGIC))
+		pan_vbc(bo->vbc);
+
 }
 
 /*--------------------------------------------------------------------*/
@@ -271,9 +274,6 @@ pan_sess(const struct sess *sp)
 	if (VALID_OBJ(sp->vcl, VCL_CONF_MAGIC))
 		pan_vcl(sp->vcl);
 
-	if (VALID_OBJ(sp->wrk->vbc, BACKEND_MAGIC))
-		pan_vbc(sp->wrk->vbc);
-
 	if (VALID_OBJ(sp->wrk->obj, OBJECT_MAGIC))
 		pan_object(sp->wrk->obj);
 
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 3cfd451..b7c43a1 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -291,10 +291,11 @@ WSLB(struct worker *w, enum VSL_tag_e tag, const char *fmt, ...)
 	va_list ap;
 
 	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->vbc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
+	CHECK_OBJ_NOTNULL(w->busyobj->vbc, VBC_MAGIC);
 	AN(fmt);
 	va_start(ap, fmt);
-	wsl(w, tag, w->vbc->vsl_id, fmt, ap);
+	wsl(w, tag, w->busyobj->vbc->vsl_id, fmt, ap);
 	va_end(ap);
 }
 
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 0342de8..fea5c70 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -132,15 +132,19 @@ VRT_l_beresp_saintmode(const struct sess *sp, double a)
 	struct trouble *tr;
 	struct trouble *tr2;
 	struct worker *wrk;
+	struct vbc *vbc;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
 	wrk = sp->wrk;
-	if (!wrk->vbc)
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vbc = wrk->busyobj->vbc;
+	if (!vbc)
 		return;
-	CHECK_OBJ_NOTNULL(wrk->vbc, VBC_MAGIC);
-	if (!wrk->vbc->backend)
+	CHECK_OBJ_NOTNULL(vbc, VBC_MAGIC);
+	if (!vbc->backend)
 		return;
-	CHECK_OBJ_NOTNULL(wrk->vbc->backend, BACKEND_MAGIC);
+	CHECK_OBJ_NOTNULL(vbc->backend, BACKEND_MAGIC);
 	if (!sp->wrk->objcore)
 		return;
 	CHECK_OBJ_NOTNULL(sp->wrk->objcore, OBJCORE_MAGIC);
@@ -159,8 +163,8 @@ VRT_l_beresp_saintmode(const struct sess *sp, double a)
 	 * timeout at a later date (ie: sort by which entry will time out
 	 * from the list
 	 */
-	Lck_Lock(&wrk->vbc->backend->mtx);
-	VTAILQ_FOREACH_SAFE(tr, &wrk->vbc->backend->troublelist, list, tr2) {
+	Lck_Lock(&vbc->backend->mtx);
+	VTAILQ_FOREACH_SAFE(tr, &vbc->backend->troublelist, list, tr2) {
 		if (tr->timeout < new->timeout) {
 			VTAILQ_INSERT_BEFORE(tr, new, list);
 			new = NULL;
@@ -172,9 +176,9 @@ VRT_l_beresp_saintmode(const struct sess *sp, double a)
 	 * items have a longer timeout.
 	 */
 	if (new)
-		VTAILQ_INSERT_TAIL(&wrk->vbc->backend->troublelist, new, list);
+		VTAILQ_INSERT_TAIL(&vbc->backend->troublelist, new, list);
 
-	Lck_Unlock(&wrk->vbc->backend->mtx);
+	Lck_Unlock(&vbc->backend->mtx);
 }
 
 /*--------------------------------------------------------------------*/
@@ -253,8 +257,8 @@ VRT_r_beresp_backend_name(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->vbc, VBC_MAGIC);
-	return(sp->wrk->vbc->backend->vcl_name);
+	CHECK_OBJ_NOTNULL(sp->wrk->busyobj->vbc, VBC_MAGIC);
+	return(sp->wrk->busyobj->vbc->backend->vcl_name);
 }
 
 struct sockaddr_storage *
@@ -262,8 +266,8 @@ VRT_r_beresp_backend_ip(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->vbc, VBC_MAGIC);
-	return(sp->wrk->vbc->addr);
+	CHECK_OBJ_NOTNULL(sp->wrk->busyobj->vbc, VBC_MAGIC);
+	return(sp->wrk->busyobj->vbc->addr);
 }
 
 int
@@ -271,8 +275,8 @@ VRT_r_beresp_backend_port(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->vbc, VBC_MAGIC);
-	return (VTCP_port(sp->wrk->vbc->addr));
+	CHECK_OBJ_NOTNULL(sp->wrk->busyobj->vbc, VBC_MAGIC);
+	return (VTCP_port(sp->wrk->busyobj->vbc->addr));
 }
 
 const char * __match_proto__()
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 2748999..5de0e27 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -131,7 +131,7 @@ stv_pick_stevedore(struct worker *wrk, const char **hint)
 			return (stv_transient);
 
 		/* Hint was not valid, nuke it */
-		WSL(wrk, SLT_Debug, 0, 			/* XXX VSL_id ?? */
+		WSL(wrk, SLT_Debug, 0,			/* XXX VSL_id ?? */
 		    "Storage hint not usable");
 		*hint = NULL;
 	}



From phk at varnish-cache.org  Mon Dec  5 22:02:54 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 05 Dec 2011 23:02:54 +0100
Subject: [master] d763ce0 Tell FlexeLint to check printf-like arguments and
	fix what it found.
Message-ID: <E1RXgcg-0004DZ-6k@project.varnish-software.com>

commit d763ce00fb8599e52b1c06e99b91f257dc1bf822
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 5 22:02:22 2011 +0000

    Tell FlexeLint to check printf-like arguments and fix what it found.
    
    Prompted to by:	DocWilco

diff --git a/bin/flint.lnt b/bin/flint.lnt
index 4ad63d1..18a8d27 100644
--- a/bin/flint.lnt
+++ b/bin/flint.lnt
@@ -2,6 +2,9 @@
 
 -ffc			// No automatic custody
 
+-printf(2, VSB_printf)
+
+
 ///////////////////////////////////////////////////////////////////////
 // Weirdness relating to varnish includes etc.
 
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index ca2b616..2badb76 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -77,7 +77,7 @@ struct ban {
 	unsigned		magic;
 #define BAN_MAGIC		0x700b08ea
 	VTAILQ_ENTRY(ban)	list;
-	unsigned		refcount;
+	int			refcount;
 	unsigned		flags;
 #define BAN_F_GONE		(1 << 0)
 #define BAN_F_REQ		(1 << 2)
@@ -841,7 +841,7 @@ ban_lurker_work(const struct sess *sp, unsigned pass)
 				break;
 			CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 			if (cache_param->diag_bitmap & 0x80000)
-				VSL(SLT_Debug, 0, "test: %p %d %d",
+				VSL(SLT_Debug, 0, "test: %p %u %u",
 				    oc, oc->flags & OC_F_LURK, pass);
 			if ((oc->flags & OC_F_LURK) == pass)
 				break;
@@ -892,7 +892,7 @@ ban_lurker_work(const struct sess *sp, unsigned pass)
 			}
 			Lck_Unlock(&oh->mtx);
 			if (cache_param->diag_bitmap & 0x80000)
-				VSL(SLT_Debug, 0, "lurker done: %p %d %d",
+				VSL(SLT_Debug, 0, "lurker done: %p %u %u",
 				    oc, oc->flags & OC_F_LURK, pass);
 			(void)HSH_Deref(sp->wrk, NULL, &o);
 			VTIM_sleep(cache_param->ban_lurker_sleep);
diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index f299bef..98d89c3 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -92,7 +92,7 @@ cli_cb_after(const struct cli *cli)
 
 	ASSERT_CLI();
 	Lck_Unlock(&cli_mtx);
-	VSL(SLT_CLI, 0, "Wr %03u %u %s",
+	VSL(SLT_CLI, 0, "Wr %03u %zd %s",
 	    cli->result, VSB_len(cli->sb), VSB_data(cli->sb));
 }
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 6483a99..5da06a7 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -565,7 +565,7 @@ FetchBody(struct worker *w, struct object *obj)
 
 	w->busyobj->fetch_obj = NULL;
 
-	WSLB(w, SLT_Fetch_Body, "%u(%s) cls %d mklen %u",
+	WSLB(w, SLT_Fetch_Body, "%u(%s) cls %d mklen %d",
 	    w->busyobj->body_status, body_status(w->busyobj->body_status),
 	    cls, mklen);
 
@@ -591,7 +591,7 @@ FetchBody(struct worker *w, struct object *obj)
 	if (cls == 0 && w->busyobj->should_close)
 		cls = 1;
 
-	WSLB(w, SLT_Length, "%u", obj->len);
+	WSLB(w, SLT_Length, "%zd", obj->len);
 
 	{
 	/* Sanity check fetch methods accounting */
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 784eb28..267af00 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -520,7 +520,7 @@ http_dissect_hdrs(struct worker *w, struct http *hp, unsigned vsl_id, char *p,
 		if (q - p > htc->maxhdr) {
 			VSC_C_main->losthdr++;
 			WSL(w, SLT_LostHeader, vsl_id, "%.*s",
-			    q - p > 20 ? 20 : q - p, p);
+			    (int)(q - p > 20 ? 20 : q - p), p);
 			return (413);
 		}
 
@@ -546,7 +546,7 @@ http_dissect_hdrs(struct worker *w, struct http *hp, unsigned vsl_id, char *p,
 		} else {
 			VSC_C_main->losthdr++;
 			WSL(w, SLT_LostHeader, vsl_id, "%.*s",
-			    q - p > 20 ? 20 : q - p, p);
+			    (int)(q - p > 20 ? 20 : q - p), p);
 			return (413);
 		}
 	}
diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index d74e31a..78b5e42 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -114,7 +114,7 @@ Lck__Trylock(struct lock *lck, const char *p, const char *f, int l)
 	assert(r == 0 || r == EBUSY);
 	if (cache_param->diag_bitmap & 0x8)
 		VSL(SLT_Debug, 0,
-		    "MTX_TRYLOCK(%s,%s,%d,%s) = %d", p, f, l, ilck->w);
+		    "MTX_TRYLOCK(%s,%s,%d,%s) = %d", p, f, l, ilck->w, r);
 	if (r == 0) {
 		AZ(ilck->held);
 		ilck->held = 1;
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 923abbd..9fa14e0 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -234,7 +234,7 @@ pan_sess(const struct sess *sp)
 
 	VSB_printf(pan_vsp, "sp = %p {\n", sp);
 	VSB_printf(pan_vsp,
-	    "  fd = %d, id = %d, xid = %u,\n",
+	    "  fd = %d, id = %u, xid = %u,\n",
 	    sp->fd, sp->vsl_id & VSL_IDENTMASK, sp->xid);
 	VSB_printf(pan_vsp, "  client = %s %s,\n",
 	    sp->addr ? sp->addr : "?.?.?.?",
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 026f937..f55607b 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -64,7 +64,7 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 {
 	char *v, *p, *q, *h, *e;
 	struct vsb *sb, *sbh;
-	int l;
+	unsigned l;
 
 	/* No Vary: header, no worries */
 	if (!http_GetHdr(hp, H_Vary, &v))
@@ -109,7 +109,7 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 			e = h;
 			l = 0xffff;
 		}
-		VSB_printf(sb, "%c%c", (unsigned)l >> 8, l & 0xff);
+		VSB_printf(sb, "%c%c", (int)(l >> 8), (int)(l & 0xff));
 		/* Append to vary matching string */
 		VSB_bcat(sb, VSB_data(sbh), VSB_len(sbh));
 		if (e != h)
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index a0eb4c8..bbf93b5 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -74,7 +74,7 @@ VRT_count(const struct sess *sp, unsigned u)
 		return;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (cache_param->vcl_trace)
-		WSP(sp, SLT_VCL_trace, "%u %d.%d", u,
+		WSP(sp, SLT_VCL_trace, "%u %u.%u", u,
 		    sp->vcl->ref[u].line, sp->vcl->ref[u].pos);
 }
 
@@ -83,7 +83,8 @@ VRT_count(const struct sess *sp, unsigned u)
 void
 VRT_acl_log(const struct sess *sp, const char *msg)
 {
-	WSP(sp, SLT_VCL_acl, msg);
+
+	WSP(sp, SLT_VCL_acl, "%s", msg);
 }
 
 /*--------------------------------------------------------------------*/
@@ -416,7 +417,7 @@ VRT_synth_page(const struct sess *sp, unsigned flags, const char *str, ...)
 	SMS_Finish(sp->wrk->obj);
 	http_Unset(sp->wrk->obj->http, H_Content_Length);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->obj->http,
-	    "Content-Length: %d", sp->wrk->obj->len);
+	    "Content-Length: %zd", sp->wrk->obj->len);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index fea5c70..cb54837 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -55,7 +55,7 @@ vrt_do_string(struct worker *w, int fd, const struct http *hp, int fld,
 	AN(hp);
 	b = VRT_String(hp->ws, NULL, p, ap);
 	if (b == NULL || *b == '\0') {
-		WSL(w, SLT_LostHeader, fd, err);
+		WSL(w, SLT_LostHeader, fd, "%s", err);
 	} else {
 		http_SetH(hp, fld, b);
 	}
diff --git a/bin/varnishd/cache/cache_wrw.c b/bin/varnishd/cache/cache_wrw.c
index 2160f69..2ffb45e 100644
--- a/bin/varnishd/cache/cache_wrw.c
+++ b/bin/varnishd/cache/cache_wrw.c
@@ -165,7 +165,7 @@ WRW_Flush(struct worker *w)
 		if (i <= 0) {
 			wrw->werr++;
 			WSL(w, SLT_Debug, *wrw->wfd,
-			    "Write error, retval = %d, len = %d, errno = %s",
+			    "Write error, retval = %zd, len = %zd, errno = %s",
 			    i, wrw->liov, strerror(errno));
 		}
 	}
diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index ec0d955..1942c63 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -1,5 +1,11 @@
 -d__flexelint_v9__=1
 
+-printf(3, VSL)
+-printf(4, http_PrintfHeader)
+-printf(4, WSL)
+-printf(3, WSLB)
+-printf(2, VSB_printf)
+
 -esym(755, vct_*)
 -esym(759, vev_*)
 -esym(765, vev_*)
diff --git a/lib/libvcl/vcc_compile.h b/lib/libvcl/vcc_compile.h
index 8088509..b67e4ca 100644
--- a/lib/libvcl/vcc_compile.h
+++ b/lib/libvcl/vcc_compile.h
@@ -308,7 +308,7 @@ void vcc_ErrToken(const struct vcc *tl, const struct token *t);
 void vcc_ErrWhere(struct vcc *, const struct token *);
 void vcc_ErrWhere2(struct vcc *, const struct token *, const struct token *);
 
-void vcc__Expect(struct vcc *tl, unsigned tok, int line);
+void vcc__Expect(struct vcc *tl, unsigned tok, unsigned line);
 int vcc_Teq(const struct token *t1, const struct token *t2);
 int vcc_IdIs(const struct token *t, const char *p);
 void vcc_ExpectCid(struct vcc *tl);
diff --git a/lib/libvcl/vcc_token.c b/lib/libvcl/vcc_token.c
index 63ebbf3..26f2545 100644
--- a/lib/libvcl/vcc_token.c
+++ b/lib/libvcl/vcc_token.c
@@ -104,7 +104,7 @@ vcc_icoord(struct vsb *vsb, const struct token *t, int tail)
 		} else
 			pos++;
 	}
-	VSB_printf(vsb, "('%s' Line %d Pos %d)", t->src->name, lin, pos + 1);
+	VSB_printf(vsb, "('%s' Line %u Pos %u)", t->src->name, lin, pos + 1);
 }
 
 /*--------------------------------------------------------------------*/
@@ -261,7 +261,7 @@ vcc_NextToken(struct vcc *tl)
 }
 
 void
-vcc__Expect(struct vcc *tl, unsigned tok, int line)
+vcc__Expect(struct vcc *tl, unsigned tok, unsigned line)
 {
 	if (tl->t->tok == tok)
 		return;



From phk at varnish-cache.org  Tue Dec  6 07:57:22 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 08:57:22 +0100
Subject: [master] 691dcc6 Minor polish
Message-ID: <E1RXpty-0000CF-9R@project.varnish-software.com>

commit 691dcc69855ebe00fb9bdf5c9dd3ec2e5e4a816d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 07:57:13 2011 +0000

    Minor polish

diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index cf07e1d..061348a 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -197,9 +197,9 @@ VGZ_NewGzip(struct worker *wrk, const char *id)
 	 */
 	i = deflateInit2(&vg->vz,
 	    cache_param->gzip_level,		/* Level */
-	    Z_DEFLATED,			/* Method */
+	    Z_DEFLATED,				/* Method */
 	    16 + cache_param->gzip_window,	/* Window bits (16=gzip + 15) */
-	    cache_param->gzip_memlevel,	/* memLevel */
+	    cache_param->gzip_memlevel,		/* memLevel */
 	    Z_DEFAULT_STRATEGY);
 	assert(Z_OK == i);
 	return (vg);
@@ -252,11 +252,11 @@ VGZ_ObufFull(const struct vgz *vg)
  */
 
 int
-VGZ_ObufStorage(struct worker *w, struct vgz *vg)
+VGZ_ObufStorage(struct worker *wrk, struct vgz *vg)
 {
 	struct storage *st;
 
-	st = FetchStorage(w, 0);
+	st = FetchStorage(wrk, 0);
 	if (st == NULL)
 		return (-1);
 
@@ -349,7 +349,7 @@ VGZ_Gzip(struct vgz *vg, const void **pptr, size_t *plen, enum vgz_flag flags)
  */
 
 int
-VGZ_WrwGunzip(struct worker *w, struct vgz *vg, const void *ibuf,
+VGZ_WrwGunzip(struct worker *wrk, struct vgz *vg, const void *ibuf,
     ssize_t ibufl, char *obuf, ssize_t obufl, ssize_t *obufp)
 {
 	int i;
@@ -374,9 +374,9 @@ VGZ_WrwGunzip(struct worker *w, struct vgz *vg, const void *ibuf,
 			return (-1);
 		}
 		if (obufl == *obufp || i == VGZ_STUCK) {
-			w->acct_tmp.bodybytes += *obufp;
-			(void)WRW_Write(w, obuf, *obufp);
-			(void)WRW_Flush(w);
+			wrk->acct_tmp.bodybytes += *obufp;
+			(void)WRW_Write(wrk, obuf, *obufp);
+			(void)WRW_Flush(wrk);
 			*obufp = 0;
 			VGZ_Obuf(vg, obuf + *obufp, obufl - *obufp);
 		}
@@ -400,7 +400,7 @@ VGZ_UpdateObj(const struct vgz *vg, struct object *obj)
 }
 
 /*--------------------------------------------------------------------
- * Passing a vsl_id of -1 means "use w->vbc->vsl_id"
+ * Passing a vsl_id of -1 means "use wrk->vbc->vsl_id"
  */
 
 int
@@ -454,15 +454,17 @@ VGZ_Destroy(struct vgz **vgp, int vsl_id)
  */
 
 static void __match_proto__()
-vfp_gunzip_begin(struct worker *w, size_t estimate)
+vfp_gunzip_begin(struct worker *wrk, size_t estimate)
 {
 	(void)estimate;
-	AZ(w->busyobj->vgz_rx);
-	w->busyobj->vgz_rx = VGZ_NewUngzip(w, "U F -");
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->vgz_rx);
+	wrk->busyobj->vgz_rx = VGZ_NewUngzip(wrk, "U F -");
 }
 
 static int __match_proto__()
-vfp_gunzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_gunzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	struct vgz *vg;
 	ssize_t l, wl;
@@ -471,8 +473,10 @@ vfp_gunzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 	size_t dl;
 	const void *dp;
 
-	AZ(w->busyobj->fetch_failed);
-	vg = w->busyobj->vgz_rx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->fetch_failed);
+	vg = wrk->busyobj->vgz_rx;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
 	AZ(vg->vz.avail_in);
 	while (bytes > 0 || vg->vz.avail_in > 0) {
@@ -480,40 +484,42 @@ vfp_gunzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 			l = sizeof ibuf;
 			if (l > bytes)
 				l = bytes;
-			wl = HTC_Read(w, htc, ibuf, l);
+			wl = HTC_Read(wrk, htc, ibuf, l);
 			if (wl <= 0)
 				return (wl);
 			VGZ_Ibuf(vg, ibuf, wl);
 			bytes -= wl;
 		}
 
-		if (VGZ_ObufStorage(w, vg))
+		if (VGZ_ObufStorage(wrk, vg))
 			return(-1);
 		i = VGZ_Gunzip(vg, &dp, &dl);
 		if (i != VGZ_OK && i != VGZ_END)
-			return(FetchError(w, "Gunzip data error"));
-		w->busyobj->fetch_obj->len += dl;
-		if (w->busyobj->do_stream)
-			RES_StreamPoll(w);
+			return(FetchError(wrk, "Gunzip data error"));
+		wrk->busyobj->fetch_obj->len += dl;
+		if (wrk->busyobj->do_stream)
+			RES_StreamPoll(wrk);
 	}
 	assert(i == Z_OK || i == Z_STREAM_END);
 	return (1);
 }
 
 static int __match_proto__()
-vfp_gunzip_end(struct worker *w)
+vfp_gunzip_end(struct worker *wrk)
 {
 	struct vgz *vg;
 
-	vg = w->busyobj->vgz_rx;
-	w->busyobj->vgz_rx = NULL;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vg = wrk->busyobj->vgz_rx;
+	wrk->busyobj->vgz_rx = NULL;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
-	if (w->busyobj->fetch_failed) {
+	if (wrk->busyobj->fetch_failed) {
 		(void)VGZ_Destroy(&vg, -1);
 		return(0);
 	}
 	if (VGZ_Destroy(&vg, -1) != VGZ_END)
-		return(FetchError(w, "Gunzip error at the very end"));
+		return(FetchError(wrk, "Gunzip error at the very end"));
 	return (0);
 }
 
@@ -531,16 +537,18 @@ struct vfp vfp_gunzip = {
  */
 
 static void __match_proto__()
-vfp_gzip_begin(struct worker *w, size_t estimate)
+vfp_gzip_begin(struct worker *wrk, size_t estimate)
 {
 	(void)estimate;
 
-	AZ(w->busyobj->vgz_rx);
-	w->busyobj->vgz_rx = VGZ_NewGzip(w, "G F -");
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->vgz_rx);
+	wrk->busyobj->vgz_rx = VGZ_NewGzip(wrk, "G F -");
 }
 
 static int __match_proto__()
-vfp_gzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_gzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	struct vgz *vg;
 	ssize_t l, wl;
@@ -549,8 +557,10 @@ vfp_gzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 	size_t dl;
 	const void *dp;
 
-	AZ(w->busyobj->fetch_failed);
-	vg = w->busyobj->vgz_rx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->fetch_failed);
+	vg = wrk->busyobj->vgz_rx;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
 	AZ(vg->vz.avail_in);
 	while (bytes > 0 || !VGZ_IbufEmpty(vg)) {
@@ -558,50 +568,52 @@ vfp_gzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 			l = sizeof ibuf;
 			if (l > bytes)
 				l = bytes;
-			wl = HTC_Read(w, htc, ibuf, l);
+			wl = HTC_Read(wrk, htc, ibuf, l);
 			if (wl <= 0)
 				return (wl);
 			VGZ_Ibuf(vg, ibuf, wl);
 			bytes -= wl;
 		}
-		if (VGZ_ObufStorage(w, vg))
+		if (VGZ_ObufStorage(wrk, vg))
 			return(-1);
 		i = VGZ_Gzip(vg, &dp, &dl, VGZ_NORMAL);
 		assert(i == Z_OK);
-		w->busyobj->fetch_obj->len += dl;
-		if (w->busyobj->do_stream)
-			RES_StreamPoll(w);
+		wrk->busyobj->fetch_obj->len += dl;
+		if (wrk->busyobj->do_stream)
+			RES_StreamPoll(wrk);
 	}
 	return (1);
 }
 
 static int __match_proto__()
-vfp_gzip_end(struct worker *w)
+vfp_gzip_end(struct worker *wrk)
 {
 	struct vgz *vg;
 	size_t dl;
 	const void *dp;
 	int i;
 
-	vg = w->busyobj->vgz_rx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vg = wrk->busyobj->vgz_rx;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
-	w->busyobj->vgz_rx = NULL;
-	if (w->busyobj->fetch_failed) {
+	wrk->busyobj->vgz_rx = NULL;
+	if (wrk->busyobj->fetch_failed) {
 		(void)VGZ_Destroy(&vg, -1);
 		return(0);
 	}
 	do {
 		VGZ_Ibuf(vg, "", 0);
-		if (VGZ_ObufStorage(w, vg))
+		if (VGZ_ObufStorage(wrk, vg))
 			return(-1);
 		i = VGZ_Gzip(vg, &dp, &dl, VGZ_FINISH);
-		w->busyobj->fetch_obj->len += dl;
+		wrk->busyobj->fetch_obj->len += dl;
 	} while (i != Z_STREAM_END);
-	if (w->busyobj->do_stream)
-		RES_StreamPoll(w);
-	VGZ_UpdateObj(vg, w->busyobj->fetch_obj);
+	if (wrk->busyobj->do_stream)
+		RES_StreamPoll(wrk);
+	VGZ_UpdateObj(vg, wrk->busyobj->fetch_obj);
 	if (VGZ_Destroy(&vg, -1) != VGZ_END)
-		return(FetchError(w, "Gzip error at the very end"));
+		return(FetchError(wrk, "Gzip error at the very end"));
 	return (0);
 }
 
@@ -619,15 +631,17 @@ struct vfp vfp_gzip = {
  */
 
 static void __match_proto__()
-vfp_testgzip_begin(struct worker *w, size_t estimate)
+vfp_testgzip_begin(struct worker *wrk, size_t estimate)
 {
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	(void)estimate;
-	w->busyobj->vgz_rx = VGZ_NewUngzip(w, "u F -");
-	CHECK_OBJ_NOTNULL(w->busyobj->vgz_rx, VGZ_MAGIC);
+	wrk->busyobj->vgz_rx = VGZ_NewUngzip(wrk, "u F -");
+	CHECK_OBJ_NOTNULL(wrk->busyobj->vgz_rx, VGZ_MAGIC);
 }
 
 static int __match_proto__()
-vfp_testgzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_testgzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	struct vgz *vg;
 	ssize_t l, wl;
@@ -637,34 +651,36 @@ vfp_testgzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 	const void *dp;
 	struct storage *st;
 
-	AZ(w->busyobj->fetch_failed);
-	vg = w->busyobj->vgz_rx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->fetch_failed);
+	vg = wrk->busyobj->vgz_rx;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
 	AZ(vg->vz.avail_in);
 	while (bytes > 0) {
-		st = FetchStorage(w, 0);
+		st = FetchStorage(wrk, 0);
 		if (st == NULL)
 			return(-1);
 		l = st->space - st->len;
 		if (l > bytes)
 			l = bytes;
-		wl = HTC_Read(w, htc, st->ptr + st->len, l);
+		wl = HTC_Read(wrk, htc, st->ptr + st->len, l);
 		if (wl <= 0)
 			return (wl);
 		bytes -= wl;
 		VGZ_Ibuf(vg, st->ptr + st->len, wl);
 		st->len += wl;
-		w->busyobj->fetch_obj->len += wl;
-		if (w->busyobj->do_stream)
-			RES_StreamPoll(w);
+		wrk->busyobj->fetch_obj->len += wl;
+		if (wrk->busyobj->do_stream)
+			RES_StreamPoll(wrk);
 
 		while (!VGZ_IbufEmpty(vg)) {
 			VGZ_Obuf(vg, obuf, sizeof obuf);
 			i = VGZ_Gunzip(vg, &dp, &dl);
 			if (i == VGZ_END && !VGZ_IbufEmpty(vg))
-				return(FetchError(w, "Junk after gzip data"));
+				return(FetchError(wrk, "Junk after gzip data"));
 			if (i != VGZ_OK && i != VGZ_END)
-				return(FetchError2(w,
+				return(FetchError2(wrk,
 				    "Invalid Gzip data", vg->vz.msg));
 		}
 	}
@@ -673,20 +689,22 @@ vfp_testgzip_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
 }
 
 static int __match_proto__()
-vfp_testgzip_end(struct worker *w)
+vfp_testgzip_end(struct worker *wrk)
 {
 	struct vgz *vg;
 
-	vg = w->busyobj->vgz_rx;
-	w->busyobj->vgz_rx = NULL;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vg = wrk->busyobj->vgz_rx;
+	wrk->busyobj->vgz_rx = NULL;
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
-	if (w->busyobj->fetch_failed) {
+	if (wrk->busyobj->fetch_failed) {
 		(void)VGZ_Destroy(&vg, -1);
 		return(0);
 	}
-	VGZ_UpdateObj(vg, w->busyobj->fetch_obj);
+	VGZ_UpdateObj(vg, wrk->busyobj->fetch_obj);
 	if (VGZ_Destroy(&vg, -1) != VGZ_END)
-		return(FetchError(w, "TestGunzip error at the very end"));
+		return(FetchError(wrk, "TestGunzip error at the very end"));
 	return (0);
 }
 



From phk at varnish-cache.org  Tue Dec  6 08:09:59 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 09:09:59 +0100
Subject: [master] 6ac5644 Code polishing
Message-ID: <E1RXq6B-0001aY-0u@project.varnish-software.com>

commit 6ac5644bc8610840b59e52f183eed533c73f65d1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 08:09:50 2011 +0000

    Code polishing

diff --git a/bin/varnishd/cache/cache_wrw.c b/bin/varnishd/cache/cache_wrw.c
index 2ffb45e..96fa3e5 100644
--- a/bin/varnishd/cache/cache_wrw.c
+++ b/bin/varnishd/cache/cache_wrw.c
@@ -57,19 +57,19 @@
  */
 
 int
-WRW_Error(const struct worker *w)
+WRW_Error(const struct worker *wrk)
 {
 
-	return (w->wrw.werr);
+	return (wrk->wrw.werr);
 }
 
 void
-WRW_Reserve(struct worker *w, int *fd)
+WRW_Reserve(struct worker *wrk, int *fd)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 	AZ(wrw->wfd);
 	wrw->werr = 0;
 	wrw->liov = 0;
@@ -79,12 +79,12 @@ WRW_Reserve(struct worker *w, int *fd)
 }
 
 static void
-WRW_Release(struct worker *w)
+WRW_Release(struct worker *wrk)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 	AN(wrw->wfd);
 	wrw->werr = 0;
 	wrw->liov = 0;
@@ -93,15 +93,39 @@ WRW_Release(struct worker *w)
 	wrw->wfd = NULL;
 }
 
+static void
+wrw_prune(struct wrw *wrw, ssize_t bytes)
+{
+	ssize_t used = 0;
+	ssize_t j, used_here;
+
+	for (j = 0; j < wrw->niov; j++) {
+		if (used + wrw->iov[j].iov_len > bytes) {
+			/* Cutoff is in this iov */
+			used_here = bytes - used;
+			wrw->iov[j].iov_len -= used_here;
+			wrw->iov[j].iov_base =
+			    (char*)wrw->iov[j].iov_base + used_here;
+			memmove(wrw->iov, &wrw->iov[j],
+			    (wrw->niov - j) * sizeof(struct iovec));
+			wrw->niov -= j;
+			wrw->liov -= bytes;
+			return;
+		}
+		used += wrw->iov[j].iov_len;
+	}
+	assert(wrw->liov == 0);
+}
+
 unsigned
-WRW_Flush(struct worker *w)
+WRW_Flush(struct worker *wrk)
 {
 	ssize_t i;
 	struct wrw *wrw;
 	char cbuf[32];
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 	AN(wrw->wfd);
 
 	/* For chunked, there must be one slot reserved for the chunked tail */
@@ -110,7 +134,8 @@ WRW_Flush(struct worker *w)
 
 	if (*wrw->wfd >= 0 && wrw->liov > 0 && wrw->werr == 0) {
 		if (wrw->ciov < wrw->siov && wrw->cliov > 0) {
-			bprintf(cbuf, "00%jx\r\n", (intmax_t)wrw->cliov);
+			/* Add chunk head & tail */
+			bprintf(cbuf, "00%zx\r\n", wrw->cliov);
 			i = strlen(cbuf);
 			wrw->iov[wrw->ciov].iov_base = cbuf;
 			wrw->iov[wrw->ciov].iov_len = i;
@@ -123,48 +148,37 @@ WRW_Flush(struct worker *w)
 			wrw->iov[wrw->ciov].iov_base = cbuf;
 			wrw->iov[wrw->ciov].iov_len = 0;
 		}
+
 		i = writev(*wrw->wfd, wrw->iov, wrw->niov);
 		while (i != wrw->liov && i > 0) {
 			/* Remove sent data from start of I/O vector,
 			 * then retry; we hit a timeout, but some data
 			 * was sent.
-
-			 XXX: Add a "minimum sent data per timeout
-			 counter to prevent slowlaris attacks
+			 *
+			 * XXX: Add a "minimum sent data per timeout
+			 * counter to prevent slowlaris attacks
 			*/
-			size_t used = 0;
 
-			if (VTIM_real() - w->sp->t_resp > cache_param->send_timeout) {
-				WSL(w, SLT_Debug, *wrw->wfd,
-				    "Hit total send timeout, wrote = %ld/%ld; not retrying",
+			if (VTIM_real() - wrk->sp->t_resp >
+			    cache_param->send_timeout) {
+				WSL(wrk, SLT_Debug, *wrw->wfd,
+				    "Hit total send timeout, "
+				    "wrote = %ld/%ld; not retrying",
 				    i, wrw->liov);
 				i = -1;
 				break;
 			}
 
-			WSL(w, SLT_Debug, *wrw->wfd,
+			WSL(wrk, SLT_Debug, *wrw->wfd,
 			    "Hit send timeout, wrote = %ld/%ld; retrying",
 			    i, wrw->liov);
 
-			for (int j = 0; j < wrw->niov; j++) {
-				if (used + wrw->iov[j].iov_len > i) {
-					/* Cutoff is in this iov */
-					int used_here = i - used;
-					wrw->iov[j].iov_len -= used_here;
-					wrw->iov[j].iov_base = (char*)wrw->iov[j].iov_base + used_here;
-					memmove(wrw->iov, &wrw->iov[j],
-						(wrw->niov - j) * sizeof(struct iovec));
-					wrw->niov -= j;
-					wrw->liov -= i;
-					break;
-				}
-				used += wrw->iov[j].iov_len;
-			}
+			wrw_prune(wrw, i);
 			i = writev(*wrw->wfd, wrw->iov, wrw->niov);
 		}
 		if (i <= 0) {
 			wrw->werr++;
-			WSL(w, SLT_Debug, *wrw->wfd,
+			WSL(wrk, SLT_Debug, *wrw->wfd,
 			    "Write error, retval = %zd, len = %zd, errno = %s",
 			    i, wrw->liov, strerror(errno));
 		}
@@ -178,48 +192,48 @@ WRW_Flush(struct worker *w)
 }
 
 unsigned
-WRW_FlushRelease(struct worker *w)
+WRW_FlushRelease(struct worker *wrk)
 {
 	unsigned u;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	AN(w->wrw.wfd);
-	u = WRW_Flush(w);
-	WRW_Release(w);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	AN(wrk->wrw.wfd);
+	u = WRW_Flush(wrk);
+	WRW_Release(wrk);
 	return (u);
 }
 
 unsigned
-WRW_WriteH(struct worker *w, const txt *hh, const char *suf)
+WRW_WriteH(struct worker *wrk, const txt *hh, const char *suf)
 {
 	unsigned u;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	AN(w->wrw.wfd);
-	AN(w);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	AN(wrk->wrw.wfd);
+	AN(wrk);
 	AN(hh);
 	AN(hh->b);
 	AN(hh->e);
-	u = WRW_Write(w, hh->b, hh->e - hh->b);
+	u = WRW_Write(wrk, hh->b, hh->e - hh->b);
 	if (suf != NULL)
-		u += WRW_Write(w, suf, -1);
+		u += WRW_Write(wrk, suf, -1);
 	return (u);
 }
 
 unsigned
-WRW_Write(struct worker *w, const void *ptr, int len)
+WRW_Write(struct worker *wrk, const void *ptr, int len)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 	AN(wrw->wfd);
 	if (len == 0 || *wrw->wfd < 0)
 		return (0);
 	if (len == -1)
 		len = strlen(ptr);
 	if (wrw->niov >= wrw->siov - (wrw->ciov < wrw->siov ? 1 : 0))
-		(void)WRW_Flush(w);
+		(void)WRW_Flush(wrk);
 	wrw->iov[wrw->niov].iov_base = TRUST_ME(ptr);
 	wrw->iov[wrw->niov].iov_len = len;
 	wrw->liov += len;
@@ -232,12 +246,12 @@ WRW_Write(struct worker *w, const void *ptr, int len)
 }
 
 void
-WRW_Chunked(struct worker *w)
+WRW_Chunked(struct worker *wrk)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 
 	assert(wrw->ciov == wrw->siov);
 	/*
@@ -245,7 +259,7 @@ WRW_Chunked(struct worker *w)
 	 * a chunk tail, we might as well flush right away.
 	 */
 	if (wrw->niov + 3 >= wrw->siov)
-		(void)WRW_Flush(w);
+		(void)WRW_Flush(wrk);
 	wrw->ciov = wrw->niov++;
 	wrw->cliov = 0;
 	assert(wrw->ciov < wrw->siov);
@@ -260,30 +274,30 @@ WRW_Chunked(struct worker *w)
  */
 
 void
-WRW_EndChunk(struct worker *w)
+WRW_EndChunk(struct worker *wrk)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 
 	assert(wrw->ciov < wrw->siov);
-	(void)WRW_Flush(w);
+	(void)WRW_Flush(wrk);
 	wrw->ciov = wrw->siov;
 	wrw->niov = 0;
 	wrw->cliov = 0;
-	(void)WRW_Write(w, "0\r\n\r\n", -1);
+	(void)WRW_Write(wrk, "0\r\n\r\n", -1);
 }
 
 
 #ifdef SENDFILE_WORKS
 void
-WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
+WRW_Sendfile(struct worker *wrk, int fd, off_t off, unsigned len)
 {
 	struct wrw *wrw;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	wrw = &w->wrw;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	wrw = &wrk->wrw;
 	AN(wrw->wfd);
 	assert(fd >= 0);
 	assert(len > 0);
@@ -303,7 +317,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
 	} while (0);
 #elif defined(__linux__)
 	do {
-		if (WRW_Flush(w) == 0 &&
+		if (WRW_Flush(wrk) == 0 &&
 		    sendfile(*wrw->wfd, fd, &off, len) != len)
 			wrw->werr++;
 	} while (0);
@@ -332,7 +346,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
 	} while (0);
 #elif defined(__sun) && defined(HAVE_SENDFILE)
 	do {
-		if (WRW_Flush(w) == 0 &&
+		if (WRW_Flush(wrk) == 0 &&
 		    sendfile(*wrw->wfd, fd, &off, len) != len)
 			wrw->werr++;
 	} while (0);



From phk at varnish-cache.org  Tue Dec  6 08:19:13 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 09:19:13 +0100
Subject: [master] 6d66ab6 Minor polishing
Message-ID: <E1RXqF7-0002ow-E5@project.varnish-software.com>

commit 6d66ab671ceaa31e719e868f235bd4833666e0c8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 08:19:05 2011 +0000

    Minor polishing

diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index 71ec16d..41992ab 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -86,7 +86,7 @@ struct vep_state {
 	uint32_t		crcp;
 	ssize_t			o_last;
 
-const char		*hack_p;
+	const char		*hack_p;
 	const char		*ver_p;
 
 	const char		*until;
@@ -548,16 +548,16 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
  */
 
 void
-VEP_Parse(const struct worker *w, const char *p, size_t l)
+VEP_Parse(const struct worker *wrk, const char *p, size_t l)
 {
 	struct vep_state *vep;
 	const char *e;
 	struct vep_match *vm;
 	int i;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vep = w->busyobj->vep;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vep = wrk->busyobj->vep;
 	CHECK_OBJ_NOTNULL(vep, VEP_MAGIC);
 	assert(l > 0);
 
@@ -980,13 +980,13 @@ VEP_Parse(const struct worker *w, const char *p, size_t l)
  */
 
 static ssize_t __match_proto__()
-vep_default_cb(struct worker *w, ssize_t l, enum vgz_flag flg)
+vep_default_cb(struct worker *wrk, ssize_t l, enum vgz_flag flg)
 {
 	struct vep_state *vep;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vep = w->busyobj->vep;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vep = wrk->busyobj->vep;
 	CHECK_OBJ_NOTNULL(vep, VEP_MAGIC);
 	(void)flg;
 	vep->cb_x += l;
@@ -997,22 +997,20 @@ vep_default_cb(struct worker *w, ssize_t l, enum vgz_flag flg)
  */
 
 void
-VEP_Init(struct worker *w, vep_callback_t *cb)
+VEP_Init(struct worker *wrk, vep_callback_t *cb)
 {
 	struct vep_state *vep;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	AZ(w->busyobj->vep);
-	vep = (void*)WS_Alloc(w->ws, sizeof *vep);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	AZ(wrk->busyobj->vep);
+	vep = (void*)WS_Alloc(wrk->ws, sizeof *vep);
 	AN(vep);
 
-	memset(vep, 0, sizeof *vep);
-	vep->magic = VEP_MAGIC;
-	vep->wrk = w;
+	vep->wrk = wrk;
 	vep->vsb = VSB_new_auto();
 	AN(vep->vsb);
-	w->busyobj->vep = vep;
+	wrk->busyobj->vep = vep;
 
 	if (cb != NULL) {
 		vep->dogzip = 1;
@@ -1043,14 +1041,14 @@ VEP_Init(struct worker *w, vep_callback_t *cb)
  */
 
 struct vsb *
-VEP_Finish(const struct worker *w)
+VEP_Finish(const struct worker *wrk)
 {
 	struct vep_state *vep;
 	ssize_t l, lcb;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vep = w->busyobj->vep;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vep = wrk->busyobj->vep;
 	CHECK_OBJ_NOTNULL(vep, VEP_MAGIC);
 
 	if (vep->o_pending)
@@ -1061,8 +1059,7 @@ VEP_Finish(const struct worker *w)
 	}
 	(void)vep->cb(vep->wrk, 0, VGZ_FINISH);
 
-	w->busyobj->vep = NULL;
-
+	wrk->busyobj->vep = NULL;
 	AZ(VSB_finish(vep->vsb));
 	l = VSB_len(vep->vsb);
 	if (vep->esi_found && l > 0)



From phk at varnish-cache.org  Tue Dec  6 08:40:02 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 09:40:02 +0100
Subject: [master] f178da1 More code polishing
Message-ID: <E1RXqZG-00056m-9y@project.varnish-software.com>

commit f178da155efe9d4b7a1f65bcca2557032b94f42b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 08:39:44 2011 +0000

    More code polishing
    
    Revert two lines that got last in previous commit.

diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index aea28ed..d2f4c01 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -44,7 +44,7 @@
  */
 
 static ssize_t
-vef_read(struct worker *w, struct http_conn *htc, void *buf, ssize_t buflen,
+vef_read(struct worker *wrk, struct http_conn *htc, void *buf, ssize_t buflen,
     ssize_t bytes)
 {
 	ssize_t d;
@@ -56,7 +56,7 @@ vef_read(struct worker *w, struct http_conn *htc, void *buf, ssize_t buflen,
 		if (d < bytes)
 			bytes = d;
 	}
-	return (HTC_Read(w, htc, buf, bytes));
+	return (HTC_Read(wrk, htc, buf, bytes));
 }
 
 /*---------------------------------------------------------------------
@@ -64,24 +64,24 @@ vef_read(struct worker *w, struct http_conn *htc, void *buf, ssize_t buflen,
  */
 
 static int
-vfp_esi_bytes_uu(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_esi_bytes_uu(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	ssize_t wl;
 	struct storage *st;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	while (bytes > 0) {
-		st = FetchStorage(w, 0);
+		st = FetchStorage(wrk, 0);
 		if (st == NULL)
 			return (-1);
-		wl = vef_read(w, htc,
+		wl = vef_read(wrk, htc,
 		    st->ptr + st->len, st->space - st->len, bytes);
 		if (wl <= 0)
 			return (wl);
-		VEP_Parse(w, (const char *)st->ptr + st->len, wl);
+		VEP_Parse(wrk, (const char *)st->ptr + st->len, wl);
 		st->len += wl;
-		w->busyobj->fetch_obj->len += wl;
+		wrk->busyobj->fetch_obj->len += wl;
 		bytes -= wl;
 	}
 	return (1);
@@ -92,7 +92,7 @@ vfp_esi_bytes_uu(struct worker *w, struct http_conn *htc, ssize_t bytes)
  */
 
 static int
-vfp_esi_bytes_gu(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_esi_bytes_gu(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	struct vgz *vg;
 	ssize_t wl;
@@ -101,23 +101,23 @@ vfp_esi_bytes_gu(struct worker *w, struct http_conn *htc, ssize_t bytes)
 	size_t dl;
 	const void *dp;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	vg = w->busyobj->vgz_rx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	vg = wrk->busyobj->vgz_rx;
 
 	while (bytes > 0) {
 		if (VGZ_IbufEmpty(vg) && bytes > 0) {
-			wl = vef_read(w, htc, ibuf, sizeof ibuf, bytes);
+			wl = vef_read(wrk, htc, ibuf, sizeof ibuf, bytes);
 			if (wl <= 0)
 				return (wl);
 			VGZ_Ibuf(vg, ibuf, wl);
 			bytes -= wl;
 		}
-		if (VGZ_ObufStorage(w, vg))
+		if (VGZ_ObufStorage(wrk, vg))
 			return(-1);
 		i = VGZ_Gunzip(vg, &dp, &dl);
 		xxxassert(i == VGZ_OK || i == VGZ_END);
-		VEP_Parse(w, dp, dl);
-		w->busyobj->fetch_obj->len += dl;
+		VEP_Parse(wrk, dp, dl);
+		wrk->busyobj->fetch_obj->len += dl;
 	}
 	return (1);
 }
@@ -142,16 +142,16 @@ struct vef_priv {
  */
 
 static ssize_t
-vfp_vep_callback(struct worker *w, ssize_t l, enum vgz_flag flg)
+vfp_vep_callback(struct worker *wrk, ssize_t l, enum vgz_flag flg)
 {
 	struct vef_priv *vef;
 	size_t dl, px;
 	const void *dp;
 	int i;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vef = w->busyobj->vef_priv;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vef = wrk->busyobj->vef_priv;
 	CHECK_OBJ_NOTNULL(vef, VEF_MAGIC);
 	assert(l >= 0);
 
@@ -181,14 +181,14 @@ vfp_vep_callback(struct worker *w, ssize_t l, enum vgz_flag flg)
 			l = 0;
 		}
 		do {
-			if (VGZ_ObufStorage(w, vef->vgz)) {
+			if (VGZ_ObufStorage(wrk, vef->vgz)) {
 				vef->error = ENOMEM;
 				vef->tot += l;
 				return (vef->tot);
 			}
 			i = VGZ_Gzip(vef->vgz, &dp, &dl, flg);
 			vef->tot += dl;
-			w->busyobj->fetch_obj->len += dl;
+			wrk->busyobj->fetch_obj->len += dl;
 		} while (!VGZ_IbufEmpty(vef->vgz) ||
 		    (flg != VGZ_NORMAL && VGZ_ObufFull(vef->vgz)));
 		if (px != 0) {
@@ -205,24 +205,24 @@ vfp_vep_callback(struct worker *w, ssize_t l, enum vgz_flag flg)
 }
 
 static int
-vfp_esi_bytes_ug(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_esi_bytes_ug(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	ssize_t wl;
 	char ibuf[cache_param->gzip_stack_buffer];
 	struct vef_priv *vef;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vef = w->busyobj->vef_priv;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vef = wrk->busyobj->vef_priv;
 	CHECK_OBJ_NOTNULL(vef, VEF_MAGIC);
 
 	while (bytes > 0) {
-		wl = vef_read(w, htc, ibuf, sizeof ibuf, bytes);
+		wl = vef_read(wrk, htc, ibuf, sizeof ibuf, bytes);
 		if (wl <= 0)
 			return (wl);
 		bytes -= wl;
 		vef->bufp = ibuf;
-		VEP_Parse(w, ibuf, wl);
+		VEP_Parse(wrk, ibuf, wl);
 		assert(vef->bufp >= ibuf && vef->bufp <= ibuf + wl);
 		if (vef->error) {
 			errno = vef->error;
@@ -243,7 +243,7 @@ vfp_esi_bytes_ug(struct worker *w, struct http_conn *htc, ssize_t bytes)
  */
 
 static int
-vfp_esi_bytes_gg(struct worker *w, struct http_conn *htc, size_t bytes)
+vfp_esi_bytes_gg(struct worker *wrk, struct http_conn *htc, size_t bytes)
 {
 	ssize_t wl;
 	char ibuf[cache_param->gzip_stack_buffer];
@@ -253,29 +253,29 @@ vfp_esi_bytes_gg(struct worker *w, struct http_conn *htc, size_t bytes)
 	const void *dp;
 	int i;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	vef = w->busyobj->vef_priv;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	vef = wrk->busyobj->vef_priv;
 	CHECK_OBJ_NOTNULL(vef, VEF_MAGIC);
 	assert(sizeof ibuf >= 1024);
 	ibuf2[0] = 0; /* For Flexelint */
 
 	while (bytes > 0) {
-		wl = vef_read(w, htc, ibuf, sizeof ibuf, bytes);
+		wl = vef_read(wrk, htc, ibuf, sizeof ibuf, bytes);
 		if (wl <= 0)
 			return (wl);
 		bytes -= wl;
 
 		vef->bufp = ibuf;
-		VGZ_Ibuf(w->busyobj->vgz_rx, ibuf, wl);
+		VGZ_Ibuf(wrk->busyobj->vgz_rx, ibuf, wl);
 		do {
-			VGZ_Obuf(w->busyobj->vgz_rx, ibuf2, sizeof ibuf2);
-			i = VGZ_Gunzip(w->busyobj->vgz_rx, &dp, &dl);
+			VGZ_Obuf(wrk->busyobj->vgz_rx, ibuf2, sizeof ibuf2);
+			i = VGZ_Gunzip(wrk->busyobj->vgz_rx, &dp, &dl);
 			/* XXX: check i */
 			assert(i >= VGZ_OK);
 			vef->bufp = ibuf2;
 			if (dl > 0)
-				VEP_Parse(w, ibuf2, dl);
+				VEP_Parse(wrk, ibuf2, dl);
 			if (vef->error) {
 				errno = vef->error;
 				return (-1);
@@ -287,7 +287,7 @@ vfp_esi_bytes_gg(struct worker *w, struct http_conn *htc, size_t bytes)
 				    vef->bufp, dl);
 				vef->npend += dl;
 			}
-		} while (!VGZ_IbufEmpty(w->busyobj->vgz_rx));
+		} while (!VGZ_IbufEmpty(wrk->busyobj->vgz_rx));
 	}
 	return (1);
 }
@@ -296,108 +296,114 @@ vfp_esi_bytes_gg(struct worker *w, struct http_conn *htc, size_t bytes)
 /*---------------------------------------------------------------------*/
 
 static void __match_proto__()
-vfp_esi_begin(struct worker *w, size_t estimate)
+vfp_esi_begin(struct worker *wrk, size_t estimate)
 {
+	struct busyobj *bo;
 	struct vef_priv *vef;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-
-	AZ(w->busyobj->vgz_rx);
-	if (w->busyobj->is_gzip && w->busyobj->do_gunzip) {
-		w->busyobj->vgz_rx = VGZ_NewUngzip(w, "U F E");
-		VEP_Init(w, NULL);
-	} else if (w->busyobj->is_gunzip && w->busyobj->do_gzip) {
+	(void)estimate;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	bo = wrk->busyobj;
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+
+	AZ(bo->vgz_rx);
+	if (bo->is_gzip && bo->do_gunzip) {
+		bo->vgz_rx = VGZ_NewUngzip(wrk, "U F E");
+		VEP_Init(wrk, NULL);
+	} else if (bo->is_gunzip && bo->do_gzip) {
 		ALLOC_OBJ(vef, VEF_MAGIC);
 		AN(vef);
-		vef->vgz = VGZ_NewGzip(w, "G F E");
-		AZ(w->busyobj->vef_priv);
-		w->busyobj->vef_priv = vef;
-		VEP_Init(w, vfp_vep_callback);
-	} else if (w->busyobj->is_gzip) {
-		w->busyobj->vgz_rx = VGZ_NewUngzip(w, "U F E");
+		vef->vgz = VGZ_NewGzip(wrk, "G F E");
+		AZ(bo->vef_priv);
+		bo->vef_priv = vef;
+		VEP_Init(wrk, vfp_vep_callback);
+	} else if (bo->is_gzip) {
+		bo->vgz_rx = VGZ_NewUngzip(wrk, "U F E");
 		ALLOC_OBJ(vef, VEF_MAGIC);
 		AN(vef);
-		vef->vgz = VGZ_NewGzip(w, "G F E");
-		AZ(w->busyobj->vef_priv);
-		w->busyobj->vef_priv = vef;
-		VEP_Init(w, vfp_vep_callback);
+		vef->vgz = VGZ_NewGzip(wrk, "G F E");
+		AZ(bo->vef_priv);
+		bo->vef_priv = vef;
+		VEP_Init(wrk, vfp_vep_callback);
 	} else {
-		AZ(w->busyobj->vef_priv);
-		VEP_Init(w, NULL);
+		AZ(bo->vef_priv);
+		VEP_Init(wrk, NULL);
 	}
 
-	(void)estimate;
-	AN(w->busyobj->vep);
+	AN(bo->vep);
 }
 
 static int __match_proto__()
-vfp_esi_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_esi_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
+	struct busyobj *bo;
 	int i;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	AZ(w->busyobj->fetch_failed);
-	AN(w->busyobj->vep);
-	assert(&w->busyobj->htc == htc);
-	if (w->busyobj->is_gzip && w->busyobj->do_gunzip)
-		i = vfp_esi_bytes_gu(w, htc, bytes);
-	else if (w->busyobj->is_gunzip && w->busyobj->do_gzip)
-		i = vfp_esi_bytes_ug(w, htc, bytes);
-	else if (w->busyobj->is_gzip)
-		i = vfp_esi_bytes_gg(w, htc, bytes);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	bo = wrk->busyobj;
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+
+	AZ(bo->fetch_failed);
+	AN(bo->vep);
+	assert(&bo->htc == htc);
+	if (bo->is_gzip && bo->do_gunzip)
+		i = vfp_esi_bytes_gu(wrk, htc, bytes);
+	else if (bo->is_gunzip && bo->do_gzip)
+		i = vfp_esi_bytes_ug(wrk, htc, bytes);
+	else if (bo->is_gzip)
+		i = vfp_esi_bytes_gg(wrk, htc, bytes);
 	else
-		i = vfp_esi_bytes_uu(w, htc, bytes);
-	AN(w->busyobj->vep);
+		i = vfp_esi_bytes_uu(wrk, htc, bytes);
+	AN(bo->vep);
 	return (i);
 }
 
 static int __match_proto__()
-vfp_esi_end(struct worker *w)
+vfp_esi_end(struct worker *wrk)
 {
 	struct vsb *vsb;
 	struct vef_priv *vef;
+	struct busyobj *bo;
 	ssize_t l;
 	int retval;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	AN(w->busyobj->vep);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	bo = wrk->busyobj;
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	AN(bo->vep);
 
-	retval = w->busyobj->fetch_failed;
+	retval = bo->fetch_failed;
 
-	if (w->busyobj->vgz_rx != NULL &&
-	     VGZ_Destroy(&w->busyobj->vgz_rx, -1) != VGZ_END)
-		retval = FetchError(w,
-		    "Gunzip+ESI Failed at the very end");
+	if (bo->vgz_rx != NULL && VGZ_Destroy(&bo->vgz_rx, -1) != VGZ_END)
+		retval = FetchError(wrk, "Gunzip+ESI Failed at the very end");
 
-	vsb = VEP_Finish(w);
+	vsb = VEP_Finish(wrk);
 
 	if (vsb != NULL) {
 		if (!retval) {
 			l = VSB_len(vsb);
 			assert(l > 0);
 			/* XXX: This is a huge waste of storage... */
-			w->busyobj->fetch_obj->esidata = STV_alloc(w, l);
-			if (w->busyobj->fetch_obj->esidata != NULL) {
-				memcpy(w->busyobj->fetch_obj->esidata->ptr,
+			bo->fetch_obj->esidata = STV_alloc(wrk, l);
+			if (bo->fetch_obj->esidata != NULL) {
+				memcpy(bo->fetch_obj->esidata->ptr,
 				    VSB_data(vsb), l);
-				w->busyobj->fetch_obj->esidata->len = l;
+				bo->fetch_obj->esidata->len = l;
 			} else {
-				retval = FetchError(w,
+				retval = FetchError(wrk,
 				    "Could not allocate storage for esidata");
 			}
 		}
 		VSB_delete(vsb);
 	}
 
-	vef = w->busyobj->vef_priv;
+	vef = bo->vef_priv;
 	if (vef != NULL) {
 		CHECK_OBJ_NOTNULL(vef, VEF_MAGIC);
-		w->busyobj->vef_priv = NULL;
-		VGZ_UpdateObj(vef->vgz, w->busyobj->fetch_obj);
+		bo->vef_priv = NULL;
+		VGZ_UpdateObj(vef->vgz, bo->fetch_obj);
 		if (VGZ_Destroy(&vef->vgz,  -1) != VGZ_END)
-			retval = FetchError(w,
+			retval = FetchError(wrk,
 			    "ESI+Gzip Failed at the very end");
 		FREE_OBJ(vef);
 	}
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index 41992ab..e431a8d 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -1007,6 +1007,8 @@ VEP_Init(struct worker *wrk, vep_callback_t *cb)
 	vep = (void*)WS_Alloc(wrk->ws, sizeof *vep);
 	AN(vep);
 
+	memset(vep, 0, sizeof *vep);
+	vep->magic = VEP_MAGIC;
 	vep->wrk = wrk;
 	vep->vsb = VSB_new_auto();
 	AN(vep->vsb);



From phk at varnish-cache.org  Tue Dec  6 08:59:26 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 09:59:26 +0100
Subject: [master] 3ef44da More code polishing
Message-ID: <E1RXqs2-0007Vx-GU@project.varnish-software.com>

commit 3ef44da5d44710270164d6970c3891f2b0e8ed8a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 08:59:16 2011 +0000

    More code polishing

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 5da06a7..8a1ac5b 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -46,30 +46,30 @@ static unsigned fetchfrag;
  * We want to issue the first error we encounter on fetching and
  * supress the rest.  This function does that.
  *
- * Other code is allowed to look at w->busyobj->fetch_failed to bail out
+ * Other code is allowed to look at wrk->busyobj->fetch_failed to bail out
  *
  * For convenience, always return -1
  */
 
 int
-FetchError2(struct worker *w, const char *error, const char *more)
+FetchError2(struct worker *wrk, const char *error, const char *more)
 {
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	if (!w->busyobj->fetch_failed) {
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	if (!wrk->busyobj->fetch_failed) {
 		if (more == NULL)
-			WSLB(w, SLT_FetchError, "%s", error);
+			WSLB(wrk, SLT_FetchError, "%s", error);
 		else
-			WSLB(w, SLT_FetchError, "%s: %s", error, more);
+			WSLB(wrk, SLT_FetchError, "%s: %s", error, more);
 	}
-	w->busyobj->fetch_failed = 1;
+	wrk->busyobj->fetch_failed = 1;
 	return (-1);
 }
 
 int
-FetchError(struct worker *w, const char *error)
+FetchError(struct worker *wrk, const char *error)
 {
-	return(FetchError2(w, error, NULL));
+	return(FetchError2(wrk, error, NULL));
 }
 
 /*--------------------------------------------------------------------
@@ -88,11 +88,11 @@ FetchError(struct worker *w, const char *error)
  * as seen on the socket, or zero if unknown.
  */
 static void __match_proto__()
-vfp_nop_begin(struct worker *w, size_t estimate)
+vfp_nop_begin(struct worker *wrk, size_t estimate)
 {
 
 	if (estimate > 0)
-		(void)FetchStorage(w, estimate);
+		(void)FetchStorage(wrk, estimate);
 }
 
 /*--------------------------------------------------------------------
@@ -107,27 +107,27 @@ vfp_nop_begin(struct worker *w, size_t estimate)
  */
 
 static int __match_proto__()
-vfp_nop_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
+vfp_nop_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
 {
 	ssize_t l, wl;
 	struct storage *st;
 
-	AZ(w->busyobj->fetch_failed);
+	AZ(wrk->busyobj->fetch_failed);
 	while (bytes > 0) {
-		st = FetchStorage(w, 0);
+		st = FetchStorage(wrk, 0);
 		if (st == NULL)
 			return(-1);
 		l = st->space - st->len;
 		if (l > bytes)
 			l = bytes;
-		wl = HTC_Read(w, htc, st->ptr + st->len, l);
+		wl = HTC_Read(wrk, htc, st->ptr + st->len, l);
 		if (wl <= 0)
 			return (wl);
 		st->len += wl;
-		w->busyobj->fetch_obj->len += wl;
+		wrk->busyobj->fetch_obj->len += wl;
 		bytes -= wl;
-		if (w->busyobj->do_stream)
-			RES_StreamPoll(w);
+		if (wrk->busyobj->do_stream)
+			RES_StreamPoll(wrk);
 	}
 	return (1);
 }
@@ -142,16 +142,16 @@ vfp_nop_bytes(struct worker *w, struct http_conn *htc, ssize_t bytes)
  */
 
 static int __match_proto__()
-vfp_nop_end(struct worker *w)
+vfp_nop_end(struct worker *wrk)
 {
 	struct storage *st;
 
-	st = VTAILQ_LAST(&w->busyobj->fetch_obj->store, storagehead);
+	st = VTAILQ_LAST(&wrk->busyobj->fetch_obj->store, storagehead);
 	if (st == NULL)
 		return (0);
 
 	if (st->len == 0) {
-		VTAILQ_REMOVE(&w->busyobj->fetch_obj->store, st, list);
+		VTAILQ_REMOVE(&wrk->busyobj->fetch_obj->store, st, list);
 		STV_free(st);
 		return (0);
 	}
@@ -172,13 +172,13 @@ static struct vfp vfp_nop = {
  */
 
 struct storage *
-FetchStorage(struct worker *w, ssize_t sz)
+FetchStorage(struct worker *wrk, ssize_t sz)
 {
 	ssize_t l;
 	struct storage *st;
 	struct object *obj;
 
-	obj = w->busyobj->fetch_obj;
+	obj = wrk->busyobj->fetch_obj;
 	CHECK_OBJ_NOTNULL(obj, OBJECT_MAGIC);
 	st = VTAILQ_LAST(&obj->store, storagehead);
 	if (st != NULL && st->len < st->space)
@@ -189,9 +189,9 @@ FetchStorage(struct worker *w, ssize_t sz)
 		l = sz;
 	if (l == 0)
 		l = cache_param->fetch_chunksize;
-	st = STV_alloc(w, l);
+	st = STV_alloc(wrk, l);
 	if (st == NULL) {
-		(void)FetchError(w, "Could not get storage");
+		(void)FetchError(wrk, "Could not get storage");
 		return (NULL);
 	}
 	AZ(st->len);
@@ -225,20 +225,20 @@ fetch_number(const char *nbr, int radix)
 /*--------------------------------------------------------------------*/
 
 static int
-fetch_straight(struct worker *w, struct http_conn *htc, ssize_t cl)
+fetch_straight(struct worker *wrk, struct http_conn *htc, ssize_t cl)
 {
 	int i;
 
-	assert(w->busyobj->body_status == BS_LENGTH);
+	assert(wrk->busyobj->body_status == BS_LENGTH);
 
 	if (cl < 0) {
-		return (FetchError(w, "straight length field bogus"));
+		return (FetchError(wrk, "straight length field bogus"));
 	} else if (cl == 0)
 		return (0);
 
-	i = w->busyobj->vfp->bytes(w, htc, cl);
+	i = wrk->busyobj->vfp->bytes(wrk, htc, cl);
 	if (i <= 0)
-		return (FetchError(w, "straight insufficient bytes"));
+		return (FetchError(wrk, "straight insufficient bytes"));
 	return (0);
 }
 
@@ -249,28 +249,28 @@ fetch_straight(struct worker *w, struct http_conn *htc, ssize_t cl)
  */
 
 static int
-fetch_chunked(struct worker *w, struct http_conn *htc)
+fetch_chunked(struct worker *wrk, struct http_conn *htc)
 {
 	int i;
 	char buf[20];		/* XXX: 20 is arbitrary */
 	unsigned u;
 	ssize_t cl;
 
-	assert(w->busyobj->body_status == BS_CHUNKED);
+	assert(wrk->busyobj->body_status == BS_CHUNKED);
 	do {
 		/* Skip leading whitespace */
 		do {
-			if (HTC_Read(w, htc, buf, 1) <= 0)
+			if (HTC_Read(wrk, htc, buf, 1) <= 0)
 				return (-1);
 		} while (vct_islws(buf[0]));
 
 		if (!vct_ishex(buf[0]))
-			return (FetchError(w,"chunked header non-hex"));
+			return (FetchError(wrk,"chunked header non-hex"));
 
 		/* Collect hex digits, skipping leading zeros */
 		for (u = 1; u < sizeof buf; u++) {
 			do {
-				if (HTC_Read(w, htc, buf + u, 1) <= 0)
+				if (HTC_Read(wrk, htc, buf + u, 1) <= 0)
 					return (-1);
 			} while (u == 1 && buf[0] == '0' && buf[u] == '0');
 			if (!vct_ishex(buf[u]))
@@ -278,31 +278,31 @@ fetch_chunked(struct worker *w, struct http_conn *htc)
 		}
 
 		if (u >= sizeof buf)
-			return (FetchError(w,"chunked header too long"));
+			return (FetchError(wrk,"chunked header too long"));
 
 		/* Skip trailing white space */
 		while(vct_islws(buf[u]) && buf[u] != '\n')
-			if (HTC_Read(w, htc, buf + u, 1) <= 0)
+			if (HTC_Read(wrk, htc, buf + u, 1) <= 0)
 				return (-1);
 
 		if (buf[u] != '\n')
-			return (FetchError(w,"chunked header no NL"));
+			return (FetchError(wrk,"chunked header no NL"));
 
 		buf[u] = '\0';
 		cl = fetch_number(buf, 16);
 		if (cl < 0)
-			return (FetchError(w,"chunked header number syntax"));
+			return (FetchError(wrk,"chunked header number syntax"));
 
-		if (cl > 0 && w->busyobj->vfp->bytes(w, htc, cl) <= 0)
+		if (cl > 0 && wrk->busyobj->vfp->bytes(wrk, htc, cl) <= 0)
 			return (-1);
 
-		i = HTC_Read(w, htc, buf, 1);
+		i = HTC_Read(wrk, htc, buf, 1);
 		if (i <= 0)
 			return (-1);
-		if (buf[0] == '\r' && HTC_Read(w, htc, buf, 1) <= 0)
+		if (buf[0] == '\r' && HTC_Read(wrk, htc, buf, 1) <= 0)
 			return (-1);
 		if (buf[0] != '\n')
-			return (FetchError(w,"chunked tail no NL"));
+			return (FetchError(wrk,"chunked tail no NL"));
 	} while (cl > 0);
 	return (0);
 }
@@ -310,12 +310,12 @@ fetch_chunked(struct worker *w, struct http_conn *htc)
 /*--------------------------------------------------------------------*/
 
 static int
-fetch_eof(struct worker *w, struct http_conn *htc)
+fetch_eof(struct worker *wrk, struct http_conn *htc)
 {
 	int i;
 
-	assert(w->busyobj->body_status == BS_EOF);
-	i = w->busyobj->vfp->bytes(w, htc, SSIZE_MAX);
+	assert(wrk->busyobj->body_status == BS_EOF);
+	i = wrk->busyobj->vfp->bytes(wrk, htc, SSIZE_MAX);
 	if (i < 0)
 		return (-1);
 	return (0);
@@ -378,7 +378,7 @@ int
 FetchHdr(struct sess *sp, int need_host_hdr)
 {
 	struct vbc *vc;
-	struct worker *w;
+	struct worker *wrk;
 	struct http *hp;
 	int retry = -1;
 	int i;
@@ -386,9 +386,9 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
-	w = sp->wrk;
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	htc = &w->busyobj->htc;
+	wrk = sp->wrk;
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	htc = &wrk->busyobj->htc;
 
 	AN(sp->director);
 	AZ(sp->wrk->obj);
@@ -398,7 +398,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 		AN(sp->wrk->objcore->flags & OC_F_BUSY);
 	}
 
-	hp = w->bereq;
+	hp = wrk->bereq;
 
 	sp->wrk->busyobj->vbc = VDI_GetFd(NULL, sp);
 	if (sp->wrk->busyobj->vbc == NULL) {
@@ -418,12 +418,12 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 		VDI_AddHostHeader(sp->wrk, vc);
 
 	(void)VTCP_blocking(vc->fd);	/* XXX: we should timeout instead */
-	WRW_Reserve(w, &vc->fd);
-	(void)http_Write(w, vc->vsl_id, hp, 0);	/* XXX: stats ? */
+	WRW_Reserve(wrk, &vc->fd);
+	(void)http_Write(wrk, vc->vsl_id, hp, 0);	/* XXX: stats ? */
 
 	/* Deal with any message-body the request might have */
 	i = FetchReqBody(sp);
-	if (WRW_FlushRelease(w) || i > 0) {
+	if (WRW_FlushRelease(wrk) || i > 0) {
 		WSP(sp, SLT_FetchError, "backend write error: %d (%s)",
 		    errno, strerror(errno));
 		VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
@@ -432,14 +432,14 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	}
 
 	/* Checkpoint the vsl.here */
-	WSL_Flush(w, 0);
+	WSL_Flush(wrk, 0);
 
 	/* XXX is this the right place? */
 	VSC_C_main->backend_req++;
 
 	/* Receive response */
 
-	HTC_Init(htc, w->ws, vc->fd, vc->vsl_id,
+	HTC_Init(htc, wrk->ws, vc->fd, vc->vsl_id,
 	    cache_param->http_resp_size,
 	    cache_param->http_resp_hdr_len);
 
@@ -470,9 +470,9 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 		}
 	}
 
-	hp = w->beresp;
+	hp = wrk->beresp;
 
-	if (http_DissectResponse(w, htc, hp)) {
+	if (http_DissectResponse(wrk, htc, hp)) {
 		WSP(sp, SLT_FetchError, "http format error");
 		VDI_CloseFd(sp->wrk, &sp->wrk->busyobj->vbc);
 		/* XXX: other cleanup ? */
@@ -484,37 +484,39 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 /*--------------------------------------------------------------------*/
 
 int
-FetchBody(struct worker *w, struct object *obj)
+FetchBody(struct worker *wrk, struct object *obj)
 {
 	int cls;
 	struct storage *st;
 	int mklen;
 	ssize_t cl;
 	struct http_conn *htc;
+	struct busyobj *bo;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	AZ(w->busyobj->fetch_obj);
-	CHECK_OBJ_NOTNULL(w->busyobj->vbc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	bo = wrk->busyobj;
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	AZ(bo->fetch_obj);
+	CHECK_OBJ_NOTNULL(bo->vbc, VBC_MAGIC);
 	CHECK_OBJ_NOTNULL(obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(obj->http, HTTP_MAGIC);
 
-	htc = &w->busyobj->htc;
+	htc = &bo->htc;
 
-	if (w->busyobj->vfp == NULL)
-		w->busyobj->vfp = &vfp_nop;
+	if (bo->vfp == NULL)
+		bo->vfp = &vfp_nop;
 
 	AssertObjCorePassOrBusy(obj->objcore);
 
-	AZ(w->busyobj->vgz_rx);
+	AZ(bo->vgz_rx);
 	AZ(VTAILQ_FIRST(&obj->store));
 
-	w->busyobj->fetch_obj = obj;
-	w->busyobj->fetch_failed = 0;
+	bo->fetch_obj = obj;
+	bo->fetch_failed = 0;
 
 	/* XXX: pick up estimate from objdr ? */
 	cl = 0;
-	switch (w->busyobj->body_status) {
+	switch (bo->body_status) {
 	case BS_NONE:
 		cls = 0;
 		mklen = 0;
@@ -524,25 +526,25 @@ FetchBody(struct worker *w, struct object *obj)
 		mklen = 1;
 		break;
 	case BS_LENGTH:
-		cl = fetch_number( w->busyobj->h_content_length, 10);
-		w->busyobj->vfp->begin(w, cl > 0 ? cl : 0);
-		cls = fetch_straight(w, htc, cl);
+		cl = fetch_number(bo->h_content_length, 10);
+		bo->vfp->begin(wrk, cl > 0 ? cl : 0);
+		cls = fetch_straight(wrk, htc, cl);
 		mklen = 1;
-		if (w->busyobj->vfp->end(w))
+		if (bo->vfp->end(wrk))
 			cls = -1;
 		break;
 	case BS_CHUNKED:
-		w->busyobj->vfp->begin(w, cl);
-		cls = fetch_chunked(w, htc);
+		bo->vfp->begin(wrk, cl);
+		cls = fetch_chunked(wrk, htc);
 		mklen = 1;
-		if (w->busyobj->vfp->end(w))
+		if (bo->vfp->end(wrk))
 			cls = -1;
 		break;
 	case BS_EOF:
-		w->busyobj->vfp->begin(w, cl);
-		cls = fetch_eof(w, htc);
+		bo->vfp->begin(wrk, cl);
+		cls = fetch_eof(wrk, htc);
 		mklen = 1;
-		if (w->busyobj->vfp->end(w))
+		if (bo->vfp->end(wrk))
 			cls = -1;
 		break;
 	case BS_ERROR:
@@ -554,44 +556,44 @@ FetchBody(struct worker *w, struct object *obj)
 		mklen = 0;
 		INCOMPL();
 	}
-	AZ(w->busyobj->vgz_rx);
+	AZ(bo->vgz_rx);
 
 	/*
 	 * It is OK for ->end to just leave the last storage segment
-	 * sitting on w->storage, we will always call vfp_nop_end()
+	 * sitting on wrk->storage, we will always call vfp_nop_end()
 	 * to get it trimmed or thrown out if empty.
 	 */
-	AZ(vfp_nop_end(w));
+	AZ(vfp_nop_end(wrk));
 
-	w->busyobj->fetch_obj = NULL;
+	bo->fetch_obj = NULL;
 
-	WSLB(w, SLT_Fetch_Body, "%u(%s) cls %d mklen %d",
-	    w->busyobj->body_status, body_status(w->busyobj->body_status),
+	WSLB(wrk, SLT_Fetch_Body, "%u(%s) cls %d mklen %d",
+	    bo->body_status, body_status(bo->body_status),
 	    cls, mklen);
 
-	if (w->busyobj->body_status == BS_ERROR) {
-		VDI_CloseFd(w, &w->busyobj->vbc);
+	if (bo->body_status == BS_ERROR) {
+		VDI_CloseFd(wrk, &bo->vbc);
 		return (__LINE__);
 	}
 
 	if (cls < 0) {
-		w->stats.fetch_failed++;
+		wrk->stats.fetch_failed++;
 		/* XXX: Wouldn't this store automatically be released ? */
 		while (!VTAILQ_EMPTY(&obj->store)) {
 			st = VTAILQ_FIRST(&obj->store);
 			VTAILQ_REMOVE(&obj->store, st, list);
 			STV_free(st);
 		}
-		VDI_CloseFd(w, &w->busyobj->vbc);
+		VDI_CloseFd(wrk, &bo->vbc);
 		obj->len = 0;
 		return (__LINE__);
 	}
-	AZ(w->busyobj->fetch_failed);
+	AZ(bo->fetch_failed);
 
-	if (cls == 0 && w->busyobj->should_close)
+	if (cls == 0 && bo->should_close)
 		cls = 1;
 
-	WSLB(w, SLT_Length, "%zd", obj->len);
+	WSLB(wrk, SLT_Length, "%zd", obj->len);
 
 	{
 	/* Sanity check fetch methods accounting */
@@ -600,7 +602,7 @@ FetchBody(struct worker *w, struct object *obj)
 		uu = 0;
 		VTAILQ_FOREACH(st, &obj->store, list)
 			uu += st->len;
-		if (w->busyobj->do_stream)
+		if (bo->do_stream)
 			/* Streaming might have started freeing stuff */
 			assert (uu <= obj->len);
 
@@ -610,14 +612,14 @@ FetchBody(struct worker *w, struct object *obj)
 
 	if (mklen > 0) {
 		http_Unset(obj->http, H_Content_Length);
-		http_PrintfHeader(w, w->busyobj->vbc->vsl_id, obj->http,
-		    "Content-Length: %jd", (intmax_t)obj->len);
+		http_PrintfHeader(wrk, bo->vbc->vsl_id, obj->http,
+		    "Content-Length: %zd", obj->len);
 	}
 
 	if (cls)
-		VDI_CloseFd(w, &w->busyobj->vbc);
+		VDI_CloseFd(wrk, &bo->vbc);
 	else
-		VDI_RecycleFd(w, &w->busyobj->vbc);
+		VDI_RecycleFd(wrk, &bo->vbc);
 
 	return (0);
 }



From phk at varnish-cache.org  Tue Dec  6 10:00:50 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 11:00:50 +0100
Subject: [master] 4f47929 Add an objcore->getxid() method.
Message-ID: <E1RXrpS-0001Vj-NL@project.varnish-software.com>

commit 4f47929731b3dc637c0ac756e2babb4787fcb9bb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 10:00:25 2011 +0000

    Add an objcore->getxid() method.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 46af4dd..327682c 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -395,12 +395,14 @@ struct storage {
  */
 
 typedef struct object *getobj_f(struct worker *wrk, struct objcore *oc);
+typedef unsigned getxid_f(struct worker *wrk, struct objcore *oc);
 typedef void updatemeta_f(struct objcore *oc);
 typedef void freeobj_f(struct objcore *oc);
 typedef struct lru *getlru_f(const struct objcore *oc);
 
 struct objcore_methods {
 	getobj_f	*getobj;
+	getxid_f	*getxid;
 	updatemeta_f	*updatemeta;
 	freeobj_f	*freeobj;
 	getlru_f	*getlru;
@@ -429,6 +431,16 @@ struct objcore {
 	struct ban		*ban;
 };
 
+static inline unsigned
+oc_getxid(struct worker *wrk, struct objcore *oc)
+{
+	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
+
+	AN(oc->methods);
+	AN(oc->methods->getxid);
+	return (oc->methods->getxid(wrk, oc));
+}
+
 static inline struct object *
 oc_getobj(struct worker *wrk, struct objcore *oc)
 {
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 23e3fc6..761a62e 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -401,7 +401,7 @@ exp_timer(struct sess *sp, void *priv)
 		CHECK_OBJ_NOTNULL(oc->objhead, OBJHEAD_MAGIC);
 		o = oc_getobj(sp->wrk, oc);
 		WSL(sp->wrk, SLT_ExpKill, 0, "%u %.0f",
-		    o->xid, EXP_Ttl(NULL, o) - t);
+		    oc_getxid(sp->wrk, oc), EXP_Ttl(NULL, o) - t);
 		(void)HSH_Deref(sp->wrk, oc, NULL);
 	}
 	NEEDLESS_RETURN(NULL);
@@ -414,10 +414,9 @@ exp_timer(struct sess *sp, void *priv)
  */
 
 int
-EXP_NukeOne(struct worker *w, struct lru *lru)
+EXP_NukeOne(struct worker *wrk, struct lru *lru)
 {
 	struct objcore *oc;
-	struct object *o;
 
 	/* Find the first currently unused object on the LRU.  */
 	Lck_Lock(&lru->mtx);
@@ -446,9 +445,8 @@ EXP_NukeOne(struct worker *w, struct lru *lru)
 		return (-1);
 
 	/* XXX: bad idea for -spersistent */
-	o = oc_getobj(w, oc);
-	WSL(w, SLT_ExpKill, 0, "%u LRU", o->xid);
-	(void)HSH_Deref(w, NULL, &o);
+	WSL(wrk, SLT_ExpKill, 0, "%u LRU", oc_getxid(wrk, oc));
+	(void)HSH_Deref(wrk, oc, NULL);
 	return (1);
 }
 
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 5de0e27..a6156d4 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -48,6 +48,15 @@ static const struct stevedore * volatile stv_next;
  * Default objcore methods
  */
 
+static unsigned __match_proto__(getxid_f)
+default_oc_getxid(struct worker *wrk, struct objcore *oc)
+{
+	struct object *o;
+
+	o = oc_getobj(wrk, oc);
+	return (o->xid);
+}
+
 static struct object * __match_proto__(getobj_f)
 default_oc_getobj(struct worker *wrk, struct objcore *oc)
 {
@@ -84,6 +93,7 @@ default_oc_getlru(const struct objcore *oc)
 
 static struct objcore_methods default_oc_methods = {
 	.getobj = default_oc_getobj,
+	.getxid = default_oc_getxid,
 	.freeobj = default_oc_freeobj,
 	.getlru = default_oc_getlru,
 };



From martin at varnish-cache.org  Tue Dec  6 10:20:12 2011
From: martin at varnish-cache.org (Martin Blix Grydeland)
Date: Tue, 06 Dec 2011 11:20:12 +0100
Subject: [master] 3d723fd Rework the busyobj handling.
Message-ID: <E1RXs8C-00066Y-PK@project.varnish-software.com>

commit 3d723fdab10f10c7f062e8350e1b81a341b28a21
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Dec 6 10:37:40 2011 +0100

    Rework the busyobj handling.
    
    This patch reworks busyobj handling so that busyobjs are owned by the issuing worker, and the worker should explicitly release it when done with it. A busy objcore only lends a pointer to it. This is to fix the current situation where the owning party is murky, and the current code will leak busyobjs in at least one situation.
    
    BusyObj's are reference counted in preperation for the streaming code.
    
    Patch also adds several asserts to help make sure the busyobjs are sound.
    
    Fixes: #1068

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 327682c..347de56 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -293,7 +293,7 @@ struct worker {
 	struct objhead		*nobjhead;
 	struct objcore		*nobjcore;
 	struct waitinglist	*nwaitinglist;
-	struct busyobj		*nbusyobj;
+	/* struct busyobj		*nbusyobj; */
 	void			*nhashpriv;
 	struct dstat		stats;
 
@@ -496,6 +496,8 @@ oc_getlru(const struct objcore *oc)
 struct busyobj {
 	unsigned		magic;
 #define BUSYOBJ_MAGIC		0x23b95567
+	unsigned		refcount;
+
 	uint8_t			*vary;
 	unsigned		is_gzip;
 	unsigned		is_gunzip;
@@ -667,8 +669,14 @@ void VDI_RecycleFd(struct worker *wrk, struct vbc **vbp);
 void VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc);
 void VBE_Poll(void);
 
-/* cache_backend_cfg.c */
+/* cache_backend.c */
 void VBE_Init(void);
+struct busyobj *VBE_GetBusyObj(void);
+struct busyobj *VBE_RefBusyObj(struct busyobj *busyobj);
+void VBE_DerefBusyObj(struct busyobj **busyobj);
+
+/* cache_backend_cfg.c */
+void VBE_InitCfg(void);
 struct backend *VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb);
 
 /* cache_backend_poll.c */
@@ -995,21 +1003,6 @@ void SMP_Init(void);
 void SMP_Ready(void);
 void SMP_NewBan(const uint8_t *ban, unsigned len);
 
-#define New_BusyObj(wrk)						\
-	do {								\
-		if (wrk->nbusyobj != NULL) {				\
-			CHECK_OBJ_NOTNULL(wrk->nbusyobj, BUSYOBJ_MAGIC);\
-			wrk->busyobj = wrk->nbusyobj;			\
-			wrk->nbusyobj = NULL;				\
-			memset(wrk->busyobj, 0, sizeof *wrk->busyobj);	\
-			wrk->busyobj->magic = BUSYOBJ_MAGIC;		\
-		} else {						\
-			ALLOC_OBJ(wrk->busyobj, BUSYOBJ_MAGIC);		\
-		}							\
-		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);		\
-		AZ(wrk->nbusyobj);					\
-	} while (0)
-
 /*
  * A normal pointer difference is signed, but we never want a negative value
  * so this little tool will make sure we don't get that.
@@ -1064,6 +1057,7 @@ AssertObjBusy(const struct object *o)
 {
 	AN(o->objcore);
 	AN (o->objcore->flags & OC_F_BUSY);
+	AN(o->objcore->busyobj);
 }
 
 static inline void
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index b661640..263aa17 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -41,6 +41,91 @@
 #include "vrt.h"
 #include "vtcp.h"
 
+static struct lock nbusyobj_mtx;
+static struct busyobj *nbusyobj;
+
+void
+VBE_Init(void)
+{
+	Lck_New(&nbusyobj_mtx, lck_nbusyobj);
+	nbusyobj = NULL;
+}
+
+/*--------------------------------------------------------------------
+ * BusyObj handling
+ */
+
+static struct busyobj *
+vbe_NewBusyObj(void)
+{
+	struct busyobj *busyobj;
+
+	ALLOC_OBJ(busyobj, BUSYOBJ_MAGIC);
+	AN(busyobj);
+	return (busyobj);
+}
+
+static void
+vbe_FreeBusyObj(struct busyobj *busyobj)
+{
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	AZ(busyobj->refcount);
+	FREE_OBJ(busyobj);
+}
+
+struct busyobj *
+VBE_GetBusyObj(void)
+{
+	struct busyobj *busyobj = NULL;
+
+	Lck_Lock(&nbusyobj_mtx);
+	if (nbusyobj != NULL) {
+		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
+		busyobj = nbusyobj;
+		nbusyobj = NULL;
+		memset(busyobj, 0, sizeof *busyobj);
+		busyobj->magic = BUSYOBJ_MAGIC;
+	}
+	Lck_Unlock(&nbusyobj_mtx);
+	if (busyobj == NULL)
+		busyobj = vbe_NewBusyObj();
+	AN(busyobj);
+	busyobj->refcount = 1;
+	return (busyobj);
+}
+
+struct busyobj *
+VBE_RefBusyObj(struct busyobj *busyobj)
+{
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	assert(busyobj->refcount > 0);
+	busyobj->refcount++;
+	return (busyobj);
+}
+
+void
+VBE_DerefBusyObj(struct busyobj **pbo)
+{
+	struct busyobj *busyobj;
+
+	busyobj = *pbo;
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	assert(busyobj->refcount > 0);
+	busyobj->refcount--;
+	*pbo = NULL;
+	if (busyobj->refcount > 0)
+		return;
+	/* XXX Sanity checks e.g. AZ(busyobj->vbc) */
+	Lck_Lock(&nbusyobj_mtx);
+	if (nbusyobj == NULL) {
+		nbusyobj = busyobj;
+		busyobj = NULL;
+	}
+	Lck_Unlock(&nbusyobj_mtx);
+	if (busyobj != NULL)
+		vbe_FreeBusyObj(busyobj);
+}
+
 /*--------------------------------------------------------------------
  * The "simple" director really isn't, since thats where all the actual
  * connections happen.  Nontheless, pretend it is simple by sequestering
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index cbb8c85..a47aa3c 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -499,7 +499,7 @@ static struct cli_proto backend_cmds[] = {
 /*---------------------------------------------------------------------*/
 
 void
-VBE_Init(void)
+VBE_InitCfg(void)
 {
 
 	Lck_New(&VBE_mtx, lck_vbe);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 079df44..995268a 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -179,8 +179,11 @@ cnt_prepresp(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 
-	if (wrk->busyobj != NULL && wrk->busyobj->do_stream)
+	if (wrk->busyobj != NULL) {
+		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+		AN(wrk->busyobj->do_stream);
 		AssertObjCorePassOrBusy(wrk->obj->objcore);
+	}
 
 	wrk->res_mode = 0;
 
@@ -248,9 +251,11 @@ cnt_prepresp(struct sess *sp)
 	case VCL_RET_RESTART:
 		if (sp->restarts >= cache_param->max_restarts)
 			break;
-		if (wrk->busyobj->do_stream) {
+		if (wrk->busyobj != NULL) {
+			AN(wrk->busyobj->do_stream);
 			VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 			HSH_Drop(wrk);
+			VBE_DerefBusyObj(&wrk->busyobj);
 		} else {
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
 		}
@@ -298,6 +303,7 @@ cnt_deliver(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
+	AZ(sp->wrk->busyobj);
 	sp->director = NULL;
 	sp->restarts = 0;
 
@@ -338,6 +344,7 @@ cnt_done(struct sess *sp)
 	CHECK_OBJ_ORNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
+	AZ(wrk->busyobj);
 	sp->director = NULL;
 	sp->restarts = 0;
 
@@ -458,7 +465,8 @@ cnt_error(struct sess *sp)
 
 	if (wrk->obj == NULL) {
 		HSH_Prealloc(sp);
-		New_BusyObj(wrk);
+		AZ(wrk->busyobj);
+		wrk->busyobj = VBE_GetBusyObj();
 		wrk->obj = STV_NewObject(wrk, NULL, cache_param->http_resp_size,
 		     (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL)
@@ -477,6 +485,7 @@ cnt_error(struct sess *sp)
 		wrk->obj->xid = sp->xid;
 		wrk->obj->exp.entered = sp->t_req;
 	} else {
+		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 		/* XXX: Null the headers ? */
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
@@ -501,6 +510,7 @@ cnt_error(struct sess *sp)
 	if (sp->handling == VCL_RET_RESTART &&
 	    sp->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
+		VBE_DerefBusyObj(&wrk->busyobj);
 		sp->director = NULL;
 		sp->restarts++;
 		sp->step = STP_RECV;
@@ -517,6 +527,7 @@ cnt_error(struct sess *sp)
 	sp->err_code = 0;
 	sp->err_reason = NULL;
 	http_Setup(wrk->bereq, NULL);
+	VBE_DerefBusyObj(&wrk->busyobj);
 	sp->step = STP_PREPRESP;
 	return (0);
 }
@@ -645,6 +656,7 @@ cnt_fetch(struct sess *sp)
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 	}
+	VBE_DerefBusyObj(&wrk->busyobj);
 	http_Setup(wrk->bereq, NULL);
 	http_Setup(wrk->beresp, NULL);
 	sp->director = NULL;
@@ -819,6 +831,7 @@ cnt_fetchbody(struct sess *sp)
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
+		VBE_DerefBusyObj(&wrk->busyobj);
 		return (0);
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
@@ -887,6 +900,7 @@ cnt_fetchbody(struct sess *sp)
 
 	if (i) {
 		HSH_Drop(wrk);
+		VBE_DerefBusyObj(&wrk->busyobj);
 		AZ(wrk->obj);
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
@@ -899,6 +913,7 @@ cnt_fetchbody(struct sess *sp)
 		AN(wrk->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	}
+	VBE_DerefBusyObj(&wrk->busyobj);
 	wrk->acct_tmp.fetch++;
 	sp->step = STP_PREPRESP;
 	return (0);
@@ -972,6 +987,7 @@ cnt_streambody(struct sess *sp)
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
+	VBE_DerefBusyObj(&wrk->busyobj);
 	http_Setup(wrk->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
@@ -1050,6 +1066,7 @@ cnt_hit(struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	AZ(wrk->busyobj);
 
 	assert(!(wrk->obj->objcore->flags & OC_F_PASS));
 
@@ -1067,7 +1084,6 @@ cnt_hit(struct sess *sp)
 	/* Drop our object, we won't need it */
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
 	wrk->objcore = NULL;
-	wrk->busyobj = NULL;
 
 	switch(sp->handling) {
 	case VCL_RET_PASS:
@@ -1127,6 +1143,7 @@ cnt_lookup(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	AZ(wrk->busyobj);
 
 	if (sp->hash_objhead == NULL) {
 		/* Not a waiting list return */
@@ -1256,20 +1273,21 @@ cnt_miss(struct sess *sp)
 	wrk->connect_timeout = 0;
 	wrk->first_byte_timeout = 0;
 	wrk->between_bytes_timeout = 0;
-	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
 	VCL_miss_method(sp);
-	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+
 	switch(sp->handling) {
 	case VCL_RET_ERROR:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 		http_Setup(wrk->bereq, NULL);
+		VBE_DerefBusyObj(&wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_PASS:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
+		VBE_DerefBusyObj(&wrk->busyobj);
 		sp->step = STP_PASS;
 		return (0);
 	case VCL_RET_FETCH:
@@ -1279,6 +1297,7 @@ cnt_miss(struct sess *sp)
 	case VCL_RET_RESTART:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
+		VBE_DerefBusyObj(&wrk->busyobj);
 		INCOMPL();
 	default:
 		WRONG("Illegal action in vcl_miss{}");
@@ -1327,6 +1346,7 @@ cnt_pass(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
+	AZ(wrk->busyobj);
 
 	WS_Reset(wrk->ws, NULL);
 	http_Setup(wrk->bereq, wrk->ws);
@@ -1345,7 +1365,7 @@ cnt_pass(struct sess *sp)
 	wrk->acct_tmp.pass++;
 	sp->sendbody = 1;
 	sp->step = STP_FETCH;
-	New_BusyObj(wrk);
+	wrk->busyobj = VBE_GetBusyObj();
 	return (0);
 }
 
@@ -1433,6 +1453,7 @@ cnt_recv(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
+	AZ(wrk->busyobj);
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 
 	/* By default we use the first backend */
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 1f1795c..e33cdbe 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -106,11 +106,6 @@ HSH_Prealloc(const struct sess *sp)
 	}
 	CHECK_OBJ_NOTNULL(w->nwaitinglist, WAITINGLIST_MAGIC);
 
-	if (w->nbusyobj == NULL) {
-		ALLOC_OBJ(w->nbusyobj, BUSYOBJ_MAGIC);
-		XXXAN(w->nbusyobj);
-	}
-
 	if (hash->prep != NULL)
 		hash->prep(sp);
 }
@@ -139,10 +134,10 @@ HSH_Cleanup(struct worker *w)
 		free(w->nhashpriv);
 		w->nhashpriv = NULL;
 	}
-	if (w->nbusyobj != NULL) {
-		FREE_OBJ(w->nbusyobj);
-		w->nbusyobj = NULL;
-	}
+	/* if (w->nbusyobj != NULL) { */
+	/* 	FREE_OBJ(w->nbusyobj); */
+	/* 	w->nbusyobj = NULL; */
+	/* } */
 }
 
 void
@@ -456,7 +451,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	AN(oc->flags & OC_F_BUSY);
 	oc->refcnt = 1;
 
-	New_BusyObj(w);
+	AZ(w->busyobj);
+	w->busyobj = VBE_GetBusyObj();
 
 	VRY_Validate(sp->vary_b);
 	if (sp->vary_l != NULL)
@@ -626,8 +622,6 @@ HSH_Unbusy(struct worker *wrk)
 	VTAILQ_REMOVE(&oh->objcs, oc, list);
 	VTAILQ_INSERT_HEAD(&oh->objcs, oc, list);
 	oc->flags &= ~OC_F_BUSY;
-	AZ(wrk->nbusyobj);
-	wrk->nbusyobj = oc->busyobj;
 	oc->busyobj = NULL;
 	if (oh->waitinglist != NULL)
 		hsh_rush(oh);
@@ -716,16 +710,6 @@ HSH_Deref(struct worker *w, struct objcore *oc, struct object **oo)
 	BAN_DestroyObj(oc);
 	AZ(oc->ban);
 
-	if (oc->flags & OC_F_BUSY) {
-		CHECK_OBJ_NOTNULL(oc->busyobj, BUSYOBJ_MAGIC);
-		if (w->nbusyobj == NULL)
-			w->nbusyobj = oc->busyobj;
-		else
-			FREE_OBJ(oc->busyobj);
-		oc->busyobj = NULL;
-	}
-	AZ(oc->busyobj);
-
 	if (oc->methods != NULL) {
 		oc_freeobj(oc);
 		w->stats.n_object--;
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index fd31de4..fbe7624 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -118,6 +118,7 @@ child_main(void)
 	HTTP_Init();
 
 	VBE_Init();
+	VBE_InitCfg();
 	VBP_Init();
 	WRK_Init();
 	Pool_Init();
diff --git a/bin/varnishtest/tests/r01068.vtc b/bin/varnishtest/tests/r01068.vtc
new file mode 100644
index 0000000..c055d19
--- /dev/null
+++ b/bin/varnishtest/tests/r01068.vtc
@@ -0,0 +1,24 @@
+varnishtest "Bug 1068 restart on hit in vcl_deliver causes segfault"
+
+server s1 {
+	rxreq
+	txresp
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_deliver {
+		if (req.http.x-restart && req.restarts == 0) {
+			return (restart);
+		}
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 200
+
+	txreq -hdr "x-restart: true"
+	rxresp
+	expect resp.status == 200
+} -run
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index f1b634b..2ad717d 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -49,4 +49,5 @@ LOCK(vbp)
 LOCK(vbe)
 LOCK(backend)
 LOCK(vcapace)
+LOCK(nbusyobj)
 /*lint -restore */



From phk at varnish-cache.org  Tue Dec  6 11:04:27 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 12:04:27 +0100
Subject: [master] 02fd3c7 Implement a getxid method that doesn't require full
	resurrection of zombie objects.
Message-ID: <E1RXsp1-0003il-Qu@project.varnish-software.com>

commit 02fd3c797265b7edbd7e5a7759b431cfd5afa91d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 11:03:36 2011 +0000

    Implement a getxid method that doesn't require full resurrection
    of zombie objects.

diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index b7ef952..7cafe4f 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -369,6 +369,35 @@ smp_loaded_st(const struct smp_sc *sc, const struct smp_seg *sg,
  * objcore methods for persistent objects
  */
 
+static unsigned __match_proto__(getxid_f)
+smp_oc_getxid(struct worker *wrk, struct objcore *oc)
+{
+	struct object *o;
+	struct smp_seg *sg;
+	struct smp_object *so;
+
+	(void)wrk;
+	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
+
+	CAST_OBJ_NOTNULL(sg, oc->priv, SMP_SEG_MAGIC);
+	so = smp_find_so(sg, oc->priv2);
+
+	o = (void*)(sg->sc->base + so->ptr);
+	/*
+	 * The object may not be in this segment since we allocate it
+	 * In a separate operation than the smp_object.  We could check
+	 * that it is in a later segment, but that would be complicated.
+	 * XXX: For now, be happy if it is inside th silo
+	 */
+	ASSERT_PTR_IN_SILO(sg->sc, o);
+	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
+	return (o->xid);
+}
+
+/*---------------------------------------------------------------------
+ * objcore methods for persistent objects
+ */
+
 static struct object *
 smp_oc_getobj(struct worker *wrk, struct objcore *oc)
 {
@@ -506,6 +535,7 @@ smp_oc_getlru(const struct objcore *oc)
 }
 
 static struct objcore_methods smp_oc_methods = {
+	.getxid =		smp_oc_getxid,
 	.getobj =		smp_oc_getobj,
 	.updatemeta =		smp_oc_updatemeta,
 	.freeobj =		smp_oc_freeobj,



From phk at varnish-cache.org  Tue Dec  6 11:04:28 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 06 Dec 2011 12:04:28 +0100
Subject: [master] 7cdeb0d Merge branch 'master' of
	ssh://git.varnish-cache.org/git/varnish-cache
Message-ID: <E1RXsp2-0003ir-5L@project.varnish-software.com>

commit 7cdeb0d5653806875fe920a4fdfb6b3d50f51e14
Merge: 02fd3c7 3d723fd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 11:04:23 2011 +0000

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache



From martin at varnish-cache.org  Tue Dec  6 13:08:08 2011
From: martin at varnish-cache.org (Martin Blix Grydeland)
Date: Tue, 06 Dec 2011 14:08:08 +0100
Subject: [master] 3025017 Add locks to busyobj's and use locks on refcounting.
Message-ID: <E1RXuki-0005os-IC@project.varnish-software.com>

commit 3025017171ad9d0959dfee5b5760b044cd4501e7
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Dec 6 11:55:58 2011 +0100

    Add locks to busyobj's and use locks on refcounting.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 347de56..cf0a6ee 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -496,6 +496,8 @@ oc_getlru(const struct objcore *oc)
 struct busyobj {
 	unsigned		magic;
 #define BUSYOBJ_MAGIC		0x23b95567
+	struct lock		mtx;
+	/* Members passed this line are cleared on reuse */
 	unsigned		refcount;
 
 	uint8_t			*vary;
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 263aa17..ef937ea 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -34,6 +34,8 @@
 
 #include <poll.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
 
 #include "cache.h"
 
@@ -62,6 +64,7 @@ vbe_NewBusyObj(void)
 
 	ALLOC_OBJ(busyobj, BUSYOBJ_MAGIC);
 	AN(busyobj);
+	Lck_New(&busyobj->mtx, lck_busyobj);
 	return (busyobj);
 }
 
@@ -70,6 +73,7 @@ vbe_FreeBusyObj(struct busyobj *busyobj)
 {
 	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
 	AZ(busyobj->refcount);
+	Lck_Delete(&busyobj->mtx);
 	FREE_OBJ(busyobj);
 }
 
@@ -83,8 +87,8 @@ VBE_GetBusyObj(void)
 		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
 		busyobj = nbusyobj;
 		nbusyobj = NULL;
-		memset(busyobj, 0, sizeof *busyobj);
-		busyobj->magic = BUSYOBJ_MAGIC;
+		memset((char *)busyobj + offsetof(struct busyobj, refcount), 0,
+		       sizeof *busyobj - offsetof(struct busyobj, refcount));
 	}
 	Lck_Unlock(&nbusyobj_mtx);
 	if (busyobj == NULL)
@@ -98,8 +102,10 @@ struct busyobj *
 VBE_RefBusyObj(struct busyobj *busyobj)
 {
 	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	Lck_Lock(&busyobj->mtx);
 	assert(busyobj->refcount > 0);
 	busyobj->refcount++;
+	Lck_Unlock(&busyobj->mtx);
 	return (busyobj);
 }
 
@@ -110,12 +116,18 @@ VBE_DerefBusyObj(struct busyobj **pbo)
 
 	busyobj = *pbo;
 	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	Lck_Lock(&busyobj->mtx);
 	assert(busyobj->refcount > 0);
 	busyobj->refcount--;
 	*pbo = NULL;
-	if (busyobj->refcount > 0)
+	if (busyobj->refcount > 0) {
+		Lck_Unlock(&busyobj->mtx);
 		return;
+	}
+	Lck_Unlock(&busyobj->mtx);
+
 	/* XXX Sanity checks e.g. AZ(busyobj->vbc) */
+
 	Lck_Lock(&nbusyobj_mtx);
 	if (nbusyobj == NULL) {
 		nbusyobj = busyobj;
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index 2ad717d..d86da01 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -50,4 +50,5 @@ LOCK(vbe)
 LOCK(backend)
 LOCK(vcapace)
 LOCK(nbusyobj)
+LOCK(busyobj)
 /*lint -restore */



From phk at varnish-cache.org  Wed Dec  7 10:14:29 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 07 Dec 2011 11:14:29 +0100
Subject: [master] 810428b Give VBE_GetBusyObj() and VBE_DerefBusyObj() a
	worker argument, we will need it shortly.
Message-ID: <E1RYEWD-0002Q6-2u@project.varnish-software.com>

commit 810428b8d1f7cef243707e0efa178ae045cc6e0e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 7 10:13:43 2011 +0000

    Give VBE_GetBusyObj() and VBE_DerefBusyObj() a worker argument,
    we will need it shortly.
    
    Add more calls to them, they will also be needed shortly.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index cf0a6ee..56f23fd 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -673,9 +673,9 @@ void VBE_Poll(void);
 
 /* cache_backend.c */
 void VBE_Init(void);
-struct busyobj *VBE_GetBusyObj(void);
+struct busyobj *VBE_GetBusyObj(struct worker *wrk);
 struct busyobj *VBE_RefBusyObj(struct busyobj *busyobj);
-void VBE_DerefBusyObj(struct busyobj **busyobj);
+void VBE_DerefBusyObj(struct worker *wrk, struct busyobj **busyobj);
 
 /* cache_backend_cfg.c */
 void VBE_InitCfg(void);
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index ef937ea..21c1a4c 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -78,10 +78,11 @@ vbe_FreeBusyObj(struct busyobj *busyobj)
 }
 
 struct busyobj *
-VBE_GetBusyObj(void)
+VBE_GetBusyObj(struct worker *wrk)
 {
 	struct busyobj *busyobj = NULL;
 
+	(void)wrk;
 	Lck_Lock(&nbusyobj_mtx);
 	if (nbusyobj != NULL) {
 		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
@@ -110,10 +111,11 @@ VBE_RefBusyObj(struct busyobj *busyobj)
 }
 
 void
-VBE_DerefBusyObj(struct busyobj **pbo)
+VBE_DerefBusyObj(struct worker *wrk, struct busyobj **pbo)
 {
 	struct busyobj *busyobj;
 
+	(void)wrk;
 	busyobj = *pbo;
 	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
 	Lck_Lock(&busyobj->mtx);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 995268a..79e7956 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -255,7 +255,7 @@ cnt_prepresp(struct sess *sp)
 			AN(wrk->busyobj->do_stream);
 			VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 			HSH_Drop(wrk);
-			VBE_DerefBusyObj(&wrk->busyobj);
+			VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		} else {
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
 		}
@@ -466,7 +466,7 @@ cnt_error(struct sess *sp)
 	if (wrk->obj == NULL) {
 		HSH_Prealloc(sp);
 		AZ(wrk->busyobj);
-		wrk->busyobj = VBE_GetBusyObj();
+		wrk->busyobj = VBE_GetBusyObj(wrk);
 		wrk->obj = STV_NewObject(wrk, NULL, cache_param->http_resp_size,
 		     (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL)
@@ -510,7 +510,7 @@ cnt_error(struct sess *sp)
 	if (sp->handling == VCL_RET_RESTART &&
 	    sp->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->director = NULL;
 		sp->restarts++;
 		sp->step = STP_RECV;
@@ -527,7 +527,7 @@ cnt_error(struct sess *sp)
 	sp->err_code = 0;
 	sp->err_reason = NULL;
 	http_Setup(wrk->bereq, NULL);
-	VBE_DerefBusyObj(&wrk->busyobj);
+	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_PREPRESP;
 	return (0);
 }
@@ -656,7 +656,7 @@ cnt_fetch(struct sess *sp)
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 	}
-	VBE_DerefBusyObj(&wrk->busyobj);
+	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	http_Setup(wrk->bereq, NULL);
 	http_Setup(wrk->beresp, NULL);
 	sp->director = NULL;
@@ -831,7 +831,7 @@ cnt_fetchbody(struct sess *sp)
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		return (0);
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
@@ -900,7 +900,7 @@ cnt_fetchbody(struct sess *sp)
 
 	if (i) {
 		HSH_Drop(wrk);
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		AZ(wrk->obj);
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
@@ -913,7 +913,7 @@ cnt_fetchbody(struct sess *sp)
 		AN(wrk->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	}
-	VBE_DerefBusyObj(&wrk->busyobj);
+	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	wrk->acct_tmp.fetch++;
 	sp->step = STP_PREPRESP;
 	return (0);
@@ -987,7 +987,7 @@ cnt_streambody(struct sess *sp)
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
-	VBE_DerefBusyObj(&wrk->busyobj);
+	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	http_Setup(wrk->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
@@ -1281,13 +1281,13 @@ cnt_miss(struct sess *sp)
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 		http_Setup(wrk->bereq, NULL);
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_PASS:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_PASS;
 		return (0);
 	case VCL_RET_FETCH:
@@ -1297,7 +1297,7 @@ cnt_miss(struct sess *sp)
 	case VCL_RET_RESTART:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
-		VBE_DerefBusyObj(&wrk->busyobj);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		INCOMPL();
 	default:
 		WRONG("Illegal action in vcl_miss{}");
@@ -1348,6 +1348,7 @@ cnt_pass(struct sess *sp)
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 
+	wrk->busyobj = VBE_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
 	http_Setup(wrk->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PASS);
@@ -1358,6 +1359,7 @@ cnt_pass(struct sess *sp)
 	VCL_pass_method(sp);
 	if (sp->handling == VCL_RET_ERROR) {
 		http_Setup(wrk->bereq, NULL);
+		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -1365,7 +1367,6 @@ cnt_pass(struct sess *sp)
 	wrk->acct_tmp.pass++;
 	sp->sendbody = 1;
 	sp->step = STP_FETCH;
-	wrk->busyobj = VBE_GetBusyObj();
 	return (0);
 }
 
@@ -1405,6 +1406,7 @@ cnt_pipe(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	wrk->acct_tmp.pipe++;
+	wrk->busyobj = VBE_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
 	http_Setup(wrk->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PIPE);
@@ -1417,6 +1419,7 @@ cnt_pipe(struct sess *sp)
 
 	PipeSession(sp);
 	assert(WRW_IsReleased(wrk));
+	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	http_Setup(wrk->bereq, NULL);
 	sp->step = STP_DONE;
 	return (0);
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index e33cdbe..0bd002d 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -452,7 +452,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	oc->refcnt = 1;
 
 	AZ(w->busyobj);
-	w->busyobj = VBE_GetBusyObj();
+	w->busyobj = VBE_GetBusyObj(w);
 
 	VRY_Validate(sp->vary_b);
 	if (sp->vary_l != NULL)



From phk at varnish-cache.org  Wed Dec  7 10:17:57 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 07 Dec 2011 11:17:57 +0100
Subject: [master] f483dd6 Replace 'w' with 'wrk' as the variable for worker
	thread.
Message-ID: <E1RYEZZ-0002oc-Dg@project.varnish-software.com>

commit f483dd61d454efd7b8b79f50496237ad73f8ad83
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 7 10:17:36 2011 +0000

    Replace 'w' with 'wrk' as the variable for worker thread.

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 0bd002d..8a73f6c 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -68,86 +68,86 @@ static const struct hash_slinger *hash;
 void
 HSH_Prealloc(const struct sess *sp)
 {
-	struct worker *w;
+	struct worker *wrk;
 	struct objhead *oh;
 	struct objcore *oc;
 	struct waitinglist *wl;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
-	w = sp->wrk;
+	wrk = sp->wrk;
 
-	if (w->nobjcore == NULL) {
+	if (wrk->nobjcore == NULL) {
 		ALLOC_OBJ(oc, OBJCORE_MAGIC);
 		XXXAN(oc);
-		w->nobjcore = oc;
-		w->stats.n_objectcore++;
+		wrk->nobjcore = oc;
+		wrk->stats.n_objectcore++;
 		oc->flags |= OC_F_BUSY;
 	}
-	CHECK_OBJ_NOTNULL(w->nobjcore, OBJCORE_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->nobjcore, OBJCORE_MAGIC);
 
-	if (w->nobjhead == NULL) {
+	if (wrk->nobjhead == NULL) {
 		ALLOC_OBJ(oh, OBJHEAD_MAGIC);
 		XXXAN(oh);
 		oh->refcnt = 1;
 		VTAILQ_INIT(&oh->objcs);
 		Lck_New(&oh->mtx, lck_objhdr);
-		w->nobjhead = oh;
-		w->stats.n_objecthead++;
+		wrk->nobjhead = oh;
+		wrk->stats.n_objecthead++;
 	}
-	CHECK_OBJ_NOTNULL(w->nobjhead, OBJHEAD_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->nobjhead, OBJHEAD_MAGIC);
 
-	if (w->nwaitinglist == NULL) {
+	if (wrk->nwaitinglist == NULL) {
 		ALLOC_OBJ(wl, WAITINGLIST_MAGIC);
 		XXXAN(wl);
 		VTAILQ_INIT(&wl->list);
-		w->nwaitinglist = wl;
-		w->stats.n_waitinglist++;
+		wrk->nwaitinglist = wl;
+		wrk->stats.n_waitinglist++;
 	}
-	CHECK_OBJ_NOTNULL(w->nwaitinglist, WAITINGLIST_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->nwaitinglist, WAITINGLIST_MAGIC);
 
 	if (hash->prep != NULL)
 		hash->prep(sp);
 }
 
 void
-HSH_Cleanup(struct worker *w)
+HSH_Cleanup(struct worker *wrk)
 {
 
-	if (w->nobjcore != NULL) {
-		FREE_OBJ(w->nobjcore);
-		w->stats.n_objectcore--;
-		w->nobjcore = NULL;
+	if (wrk->nobjcore != NULL) {
+		FREE_OBJ(wrk->nobjcore);
+		wrk->stats.n_objectcore--;
+		wrk->nobjcore = NULL;
 	}
-	if (w->nobjhead != NULL) {
-		Lck_Delete(&w->nobjhead->mtx);
-		FREE_OBJ(w->nobjhead);
-		w->nobjhead = NULL;
-		w->stats.n_objecthead--;
+	if (wrk->nobjhead != NULL) {
+		Lck_Delete(&wrk->nobjhead->mtx);
+		FREE_OBJ(wrk->nobjhead);
+		wrk->nobjhead = NULL;
+		wrk->stats.n_objecthead--;
 	}
-	if (w->nwaitinglist != NULL) {
-		FREE_OBJ(w->nwaitinglist);
-		w->nwaitinglist = NULL;
+	if (wrk->nwaitinglist != NULL) {
+		FREE_OBJ(wrk->nwaitinglist);
+		wrk->nwaitinglist = NULL;
 	}
-	if (w->nhashpriv != NULL) {
+	if (wrk->nhashpriv != NULL) {
 		/* XXX: If needed, add slinger method for this */
-		free(w->nhashpriv);
-		w->nhashpriv = NULL;
+		free(wrk->nhashpriv);
+		wrk->nhashpriv = NULL;
 	}
-	/* if (w->nbusyobj != NULL) { */
-	/* 	FREE_OBJ(w->nbusyobj); */
-	/* 	w->nbusyobj = NULL; */
+	/* if (wrk->nbusyobj != NULL) { */
+	/* 	FREE_OBJ(wrk->nbusyobj); */
+	/* 	wrk->nbusyobj = NULL; */
 	/* } */
 }
 
 void
-HSH_DeleteObjHead(struct worker *w, struct objhead *oh)
+HSH_DeleteObjHead(struct worker *wrk, struct objhead *oh)
 {
 
 	AZ(oh->refcnt);
 	assert(VTAILQ_EMPTY(&oh->objcs));
 	Lck_Delete(&oh->mtx);
-	w->stats.n_objecthead--;
+	wrk->stats.n_objecthead--;
 	FREE_OBJ(oh);
 }
 
@@ -251,31 +251,31 @@ hsh_testmagic(void *result)
 struct objcore *
 HSH_Insert(const struct sess *sp)
 {
-	struct worker *w;
+	struct worker *wrk;
 	struct objhead *oh;
 	struct objcore *oc;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
 	AN(hash);
-	w = sp->wrk;
+	wrk = sp->wrk;
 
 	HSH_Prealloc(sp);
 	if (cache_param->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
 
 	AZ(sp->hash_objhead);
-	AN(w->nobjhead);
-	oh = hash->lookup(sp, w->nobjhead);
+	AN(wrk->nobjhead);
+	oh = hash->lookup(sp, wrk->nobjhead);
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
-	if (oh == w->nobjhead)
-		w->nobjhead = NULL;
+	if (oh == wrk->nobjhead)
+		wrk->nobjhead = NULL;
 	Lck_Lock(&oh->mtx);
 	assert(oh->refcnt > 0);
 
 	/* Insert (precreated) objcore in objecthead */
-	oc = w->nobjcore;
-	w->nobjcore = NULL;
+	oc = wrk->nobjcore;
+	wrk->nobjcore = NULL;
 	oc->refcnt = 1;
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 	AZ(oc->flags & OC_F_BUSY);
@@ -294,7 +294,7 @@ HSH_Insert(const struct sess *sp)
 struct objcore *
 HSH_Lookup(struct sess *sp, struct objhead **poh)
 {
-	struct worker *w;
+	struct worker *wrk;
 	struct objhead *oh;
 	struct objcore *oc;
 	struct objcore *busy_oc, *grace_oc;
@@ -306,7 +306,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
 	AN(sp->director);
 	AN(hash);
-	w = sp->wrk;
+	wrk = sp->wrk;
 
 	HSH_Prealloc(sp);
 	memcpy(sp->wrk->nobjhead->digest, sp->digest, sizeof sp->digest);
@@ -322,10 +322,10 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 		oh = sp->hash_objhead;
 		sp->hash_objhead = NULL;
 	} else {
-		AN(w->nobjhead);
-		oh = hash->lookup(sp, w->nobjhead);
-		if (oh == w->nobjhead)
-			w->nobjhead = NULL;
+		AN(wrk->nobjhead);
+		oh = hash->lookup(sp, wrk->nobjhead);
+		if (oh == wrk->nobjhead)
+			wrk->nobjhead = NULL;
 	}
 
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
@@ -446,20 +446,20 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	}
 
 	/* Insert (precreated) objcore in objecthead */
-	oc = w->nobjcore;
-	w->nobjcore = NULL;
+	oc = wrk->nobjcore;
+	wrk->nobjcore = NULL;
 	AN(oc->flags & OC_F_BUSY);
 	oc->refcnt = 1;
 
-	AZ(w->busyobj);
-	w->busyobj = VBE_GetBusyObj(w);
+	AZ(wrk->busyobj);
+	wrk->busyobj = VBE_GetBusyObj(wrk);
 
 	VRY_Validate(sp->vary_b);
 	if (sp->vary_l != NULL)
-		w->busyobj->vary = sp->vary_b;
+		wrk->busyobj->vary = sp->vary_b;
 	else
-		w->busyobj->vary = NULL;
-	oc->busyobj = w->busyobj;
+		wrk->busyobj->vary = NULL;
+	oc->busyobj = wrk->busyobj;
 
 	/*
 	 * Busy objects go on the tail, so they will not trip up searches.
@@ -659,7 +659,7 @@ HSH_Ref(struct objcore *oc)
  */
 
 int
-HSH_Deref(struct worker *w, struct objcore *oc, struct object **oo)
+HSH_Deref(struct worker *wrk, struct objcore *oc, struct object **oo)
 {
 	struct object *o = NULL;
 	struct objhead *oh;
@@ -682,7 +682,7 @@ HSH_Deref(struct worker *w, struct objcore *oc, struct object **oo)
 		 */
 		STV_Freestore(o);
 		STV_free(o->objstore);
-		w->stats.n_object--;
+		wrk->stats.n_object--;
 		return (0);
 	}
 
@@ -712,16 +712,16 @@ HSH_Deref(struct worker *w, struct objcore *oc, struct object **oo)
 
 	if (oc->methods != NULL) {
 		oc_freeobj(oc);
-		w->stats.n_object--;
+		wrk->stats.n_object--;
 	}
 	FREE_OBJ(oc);
 
-	w->stats.n_objectcore--;
+	wrk->stats.n_objectcore--;
 	/* Drop our ref on the objhead */
 	assert(oh->refcnt > 0);
 	if (hash->deref(oh))
 		return (0);
-	HSH_DeleteObjHead(w, oh);
+	HSH_DeleteObjHead(wrk, oh);
 	return (0);
 }
 



From phk at varnish-cache.org  Wed Dec  7 10:31:26 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 07 Dec 2011 11:31:26 +0100
Subject: [master] 67a4826 Move beresp and bereq to busyobj,
	but leave the memory allocation in worker for now.
Message-ID: <E1RYEmc-0005To-H9@project.varnish-software.com>

commit 67a48263698c6cd5fb8c9e43768805345cc5bea6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 7 10:30:44 2011 +0000

    Move beresp and bereq to busyobj, but leave the memory allocation in
    worker for now.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 56f23fd..24c1dc9 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -328,8 +328,8 @@ struct worker {
 	const char		*storage_hint;
 
 	/* Fetch stuff.  Here because pipe has no busyobj */
-	struct http		*bereq;
-	struct http		*beresp;
+	struct http		*x_bereq;
+	struct http		*x_beresp;
 
 	/* Stream state */
 	struct stream_ctx	*sctx;
@@ -510,6 +510,8 @@ struct busyobj {
 	struct vgz		*vgz_rx;
 
 	struct vbc		*vbc;
+	struct http		*bereq;
+	struct http		*beresp;
 	struct object		*fetch_obj;
 	struct exp		exp;
 	struct http_conn	htc;
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 21c1a4c..cf9d60f 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -96,6 +96,8 @@ VBE_GetBusyObj(struct worker *wrk)
 		busyobj = vbe_NewBusyObj();
 	AN(busyobj);
 	busyobj->refcount = 1;
+	busyobj->beresp = wrk->x_beresp;
+	busyobj->bereq = wrk->x_bereq;
 	return (busyobj);
 }
 
@@ -162,10 +164,10 @@ VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc)
 {
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(wrk->bereq, HTTP_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj->bereq, HTTP_MAGIC);
 	CHECK_OBJ_NOTNULL(vbc, VBC_MAGIC);
 	CHECK_OBJ_NOTNULL(vbc->vdis, VDI_SIMPLE_MAGIC);
-	http_PrintfHeader(wrk, vbc->vsl_id, wrk->bereq,
+	http_PrintfHeader(wrk, vbc->vsl_id, wrk->busyobj->bereq,
 	    "Host: %s", vbc->vdis->vrt->hosthdr);
 }
 
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 79e7956..442e2bb 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -262,8 +262,6 @@ cnt_prepresp(struct sess *sp)
 		AZ(wrk->obj);
 		sp->restarts++;
 		sp->director = NULL;
-		http_Setup(wrk->bereq, NULL);
-		http_Setup(wrk->beresp, NULL);
 		http_Setup(wrk->resp, NULL);
 		sp->step = STP_RECV;
 		return (0);
@@ -476,8 +474,8 @@ cnt_error(struct sess *sp)
 		if (wrk->obj == NULL) {
 			sp->doclose = "Out of objects";
 			sp->director = NULL;
-			http_Setup(wrk->beresp, NULL);
-			http_Setup(wrk->bereq, NULL);
+			http_Setup(wrk->busyobj->beresp, NULL);
+			http_Setup(wrk->busyobj->bereq, NULL);
 			sp->step = STP_DONE;
 			return(0);
 		}
@@ -526,7 +524,7 @@ cnt_error(struct sess *sp)
 	assert(sp->handling == VCL_RET_DELIVER);
 	sp->err_code = 0;
 	sp->err_reason = NULL;
-	http_Setup(wrk->bereq, NULL);
+	http_Setup(wrk->busyobj->bereq, NULL);
 	VBE_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_PREPRESP;
 	return (0);
@@ -579,9 +577,9 @@ cnt_fetch(struct sess *sp)
 	AZ(wrk->busyobj->should_close);
 	AZ(wrk->storage_hint);
 
-	http_Setup(wrk->beresp, wrk->ws);
+	http_Setup(wrk->busyobj->beresp, wrk->ws);
 
-	need_host_hdr = !http_GetHdr(wrk->bereq, H_Host, NULL);
+	need_host_hdr = !http_GetHdr(wrk->busyobj->bereq, H_Host, NULL);
 
 	i = FetchHdr(sp, need_host_hdr);
 	/*
@@ -603,8 +601,8 @@ cnt_fetch(struct sess *sp)
 		 * and we rely on their content outside of VCL, so collect them
 		 * into one line here.
 		 */
-		http_CollectHdr(wrk->beresp, H_Cache_Control);
-		http_CollectHdr(wrk->beresp, H_Vary);
+		http_CollectHdr(wrk->busyobj->beresp, H_Cache_Control);
+		http_CollectHdr(wrk->busyobj->beresp, H_Vary);
 
 		/*
 		 * Figure out how the fetch is supposed to happen, before the
@@ -613,7 +611,7 @@ cnt_fetch(struct sess *sp)
 		 */
 		wrk->busyobj->body_status = RFC2616_Body(sp);
 
-		sp->err_code = http_GetStatus(wrk->beresp);
+		sp->err_code = http_GetStatus(wrk->busyobj->beresp);
 
 		/*
 		 * What does RFC2616 think about TTL ?
@@ -657,8 +655,6 @@ cnt_fetch(struct sess *sp)
 		wrk->objcore = NULL;
 	}
 	VBE_DerefBusyObj(wrk, &wrk->busyobj);
-	http_Setup(wrk->bereq, NULL);
-	http_Setup(wrk->beresp, NULL);
 	sp->director = NULL;
 	wrk->storage_hint = NULL;
 
@@ -748,10 +744,10 @@ cnt_fetchbody(struct sess *sp)
 		wrk->busyobj->do_gzip = wrk->busyobj->do_gunzip = 0;
 
 	wrk->busyobj->is_gzip =
-	    http_HdrIs(wrk->beresp, H_Content_Encoding, "gzip");
+	    http_HdrIs(wrk->busyobj->beresp, H_Content_Encoding, "gzip");
 
 	wrk->busyobj->is_gunzip =
-	    !http_GetHdr(wrk->beresp, H_Content_Encoding, NULL);
+	    !http_GetHdr(wrk->busyobj->beresp, H_Content_Encoding, NULL);
 
 	/* It can't be both */
 	assert(wrk->busyobj->is_gzip == 0 || wrk->busyobj->is_gunzip == 0);
@@ -762,7 +758,7 @@ cnt_fetchbody(struct sess *sp)
 
 	/* If we do gunzip, remove the C-E header */
 	if (wrk->busyobj->do_gunzip)
-		http_Unset(wrk->beresp, H_Content_Encoding);
+		http_Unset(wrk->busyobj->beresp, H_Content_Encoding);
 
 	/* We wont gzip unless it is ungziped */
 	if (wrk->busyobj->do_gzip && !wrk->busyobj->is_gunzip)
@@ -770,7 +766,7 @@ cnt_fetchbody(struct sess *sp)
 
 	/* If we do gzip, add the C-E header */
 	if (wrk->busyobj->do_gzip)
-		http_SetHeader(wrk, sp->vsl_id, wrk->beresp,
+		http_SetHeader(wrk, sp->vsl_id, wrk->busyobj->beresp,
 		    "Content-Encoding: gzip");
 
 	/* But we can't do both at the same time */
@@ -791,13 +787,13 @@ cnt_fetchbody(struct sess *sp)
 	if (!sp->wantbody)
 		wrk->busyobj->do_stream = 0;
 
-	l = http_EstimateWS(wrk->beresp,
+	l = http_EstimateWS(wrk->busyobj->beresp,
 	    pass ? HTTPH_R_PASS : HTTPH_A_INS, &nhttp);
 
 	/* Create Vary instructions */
 	if (wrk->objcore != NULL) {
 		CHECK_OBJ_NOTNULL(wrk->objcore, OBJCORE_MAGIC);
-		vary = VRY_Create(sp, wrk->beresp);
+		vary = VRY_Create(sp, wrk->busyobj->beresp);
 		if (vary != NULL) {
 			varyl = VSB_len(vary);
 			assert(varyl > 0);
@@ -855,7 +851,7 @@ cnt_fetchbody(struct sess *sp)
 	WS_Assert(wrk->obj->ws_o);
 
 	/* Filter into object */
-	hp = wrk->beresp;
+	hp = wrk->busyobj->beresp;
 	hp2 = wrk->obj->http;
 
 	hp2->logtag = HTTP_Obj;
@@ -891,8 +887,8 @@ cnt_fetchbody(struct sess *sp)
 	/* Use unmodified headers*/
 	i = FetchBody(wrk, wrk->obj);
 
-	http_Setup(wrk->bereq, NULL);
-	http_Setup(wrk->beresp, NULL);
+	http_Setup(wrk->busyobj->bereq, NULL);
+	http_Setup(wrk->busyobj->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
 	assert(WRW_IsReleased(wrk));
 	AZ(wrk->busyobj->vbc);
@@ -961,8 +957,8 @@ cnt_streambody(struct sess *sp)
 
 	i = FetchBody(wrk, wrk->obj);
 
-	http_Setup(wrk->bereq, NULL);
-	http_Setup(wrk->beresp, NULL);
+	http_Setup(wrk->busyobj->bereq, NULL);
+	http_Setup(wrk->busyobj->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
 	AZ(wrk->busyobj->vbc);
 	AN(sp->director);
@@ -1075,8 +1071,8 @@ cnt_hit(struct sess *sp)
 	if (sp->handling == VCL_RET_DELIVER) {
 		/* Dispose of any body part of the request */
 		(void)FetchReqBody(sp);
-		AZ(wrk->bereq->ws);
-		AZ(wrk->beresp->ws);
+		//AZ(wrk->busyobj->bereq->ws);
+		//AZ(wrk->busyobj->beresp->ws);
 		sp->step = STP_PREPRESP;
 		return (0);
 	}
@@ -1257,17 +1253,18 @@ cnt_miss(struct sess *sp)
 	AN(wrk->objcore);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	WS_Reset(wrk->ws, NULL);
-	http_Setup(wrk->bereq, wrk->ws);
+	wrk->busyobj = VBE_GetBusyObj(wrk);
+	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_FETCH);
-	http_ForceGet(wrk->bereq);
+	http_ForceGet(wrk->busyobj->bereq);
 	if (cache_param->http_gzip_support) {
 		/*
 		 * We always ask the backend for gzip, even if the
 		 * client doesn't grok it.  We will uncompress for
 		 * the minority of clients which don't.
 		 */
-		http_Unset(wrk->bereq, H_Accept_Encoding);
-		http_SetHeader(wrk, sp->vsl_id, wrk->bereq,
+		http_Unset(wrk->busyobj->bereq, H_Accept_Encoding);
+		http_SetHeader(wrk, sp->vsl_id, wrk->busyobj->bereq,
 		    "Accept-Encoding: gzip");
 	}
 	wrk->connect_timeout = 0;
@@ -1280,7 +1277,7 @@ cnt_miss(struct sess *sp)
 	case VCL_RET_ERROR:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
-		http_Setup(wrk->bereq, NULL);
+		http_Setup(wrk->busyobj->bereq, NULL);
 		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
@@ -1350,7 +1347,8 @@ cnt_pass(struct sess *sp)
 
 	wrk->busyobj = VBE_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
-	http_Setup(wrk->bereq, wrk->ws);
+	wrk->busyobj = VBE_GetBusyObj(wrk);
+	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PASS);
 
 	wrk->connect_timeout = 0;
@@ -1358,7 +1356,7 @@ cnt_pass(struct sess *sp)
 	wrk->between_bytes_timeout = 0;
 	VCL_pass_method(sp);
 	if (sp->handling == VCL_RET_ERROR) {
-		http_Setup(wrk->bereq, NULL);
+		http_Setup(wrk->busyobj->bereq, NULL);
 		VBE_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
@@ -1404,11 +1402,13 @@ cnt_pipe(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	AZ(wrk->busyobj);
 
 	wrk->acct_tmp.pipe++;
 	wrk->busyobj = VBE_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
-	http_Setup(wrk->bereq, wrk->ws);
+	wrk->busyobj = VBE_GetBusyObj(wrk);
+	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PIPE);
 
 	VCL_pipe_method(sp);
@@ -1419,8 +1419,8 @@ cnt_pipe(struct sess *sp)
 
 	PipeSession(sp);
 	assert(WRW_IsReleased(wrk));
+	http_Setup(wrk->busyobj->bereq, NULL);
 	VBE_DerefBusyObj(wrk, &wrk->busyobj);
-	http_Setup(wrk->bereq, NULL);
 	sp->step = STP_DONE;
 	return (0);
 }
diff --git a/bin/varnishd/cache/cache_dir_dns.c b/bin/varnishd/cache/cache_dir_dns.c
index f735ebf..56bce48 100644
--- a/bin/varnishd/cache/cache_dir_dns.c
+++ b/bin/varnishd/cache/cache_dir_dns.c
@@ -347,8 +347,8 @@ vdi_dns_find_backend(const struct sess *sp, struct vdi_dns *vs)
 	/* bereq is only present after recv et. al, otherwise use req (ie:
 	 * use req for health checks in vcl_recv and such).
 	 */
-	if (sp->wrk->bereq)
-		hp = sp->wrk->bereq;
+	if (sp->wrk->busyobj != NULL && sp->wrk->busyobj->bereq)
+		hp = sp->wrk->busyobj->bereq;
 	else
 		hp = sp->http;
 
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index e431a8d..8352717 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -499,7 +499,7 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
 		VSB_printf(vep->vsb, "%c", 0);
 	} else {
 		VSB_printf(vep->vsb, "%c", 0);
-		url = vep->wrk->bereq->hd[HTTP_HDR_URL];
+		url = vep->wrk->busyobj->bereq->hd[HTTP_HDR_URL];
 		/* Look for the last / before a '?' */
 		h = NULL;
 		for (q = url.b; q < url.e && *q != '?'; q++)
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 8a1ac5b..936dc30 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -398,7 +398,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 		AN(sp->wrk->objcore->flags & OC_F_BUSY);
 	}
 
-	hp = wrk->bereq;
+	hp = wrk->busyobj->bereq;
 
 	sp->wrk->busyobj->vbc = VDI_GetFd(NULL, sp);
 	if (sp->wrk->busyobj->vbc == NULL) {
@@ -470,7 +470,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 		}
 	}
 
-	hp = wrk->beresp;
+	hp = wrk->busyobj->beresp;
 
 	if (http_DissectResponse(wrk, htc, hp)) {
 		WSP(sp, SLT_FetchError, "http format error");
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 267af00..4a6ba82 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -869,7 +869,7 @@ http_FilterHeader(const struct sess *sp, unsigned how)
 {
 	struct http *hp;
 
-	hp = sp->wrk->bereq;
+	hp = sp->wrk->busyobj->bereq;
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 	hp->logtag = HTTP_Tx;
 
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 9fa14e0..94a4c09 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -197,10 +197,10 @@ pan_wrk(const struct worker *wrk)
 
 	VSB_printf(pan_vsp, "  worker = %p {\n", wrk);
 	pan_ws(wrk->ws, 4);
-	if (wrk->bereq->ws != NULL)
-		pan_http("bereq", wrk->bereq, 4);
-	if (wrk->beresp->ws != NULL)
-		pan_http("beresp", wrk->beresp, 4);
+	if (wrk->busyobj != NULL && wrk->busyobj->bereq->ws != NULL)
+		pan_http("bereq", wrk->busyobj->bereq, 4);
+	if (wrk->busyobj != NULL && wrk->busyobj->beresp->ws != NULL)
+		pan_http("beresp", wrk->busyobj->beresp, 4);
 	if (wrk->resp->ws != NULL)
 		pan_http("resp", wrk->resp, 4);
 	VSB_printf(pan_vsp, "  },\n");
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 5337eda..8963fb7 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -78,7 +78,7 @@ PipeSession(struct sess *sp)
 
 	WRW_Reserve(w, &vc->fd);
 	sp->wrk->acct_tmp.hdrbytes +=
-	    http_Write(w, sp->vsl_id, sp->wrk->bereq, 0);
+	    http_Write(w, sp->vsl_id, sp->wrk->busyobj->bereq, 0);
 
 	if (sp->htc->pipeline.b != NULL)
 		sp->wrk->acct_tmp.bodybytes +=
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 582bb70..cf40e85 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -196,8 +196,8 @@ Pool_Work_Thread(void *priv, struct worker *w)
 		Lck_AssertHeld(&pp->mtx);
 
 		CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-		CHECK_OBJ_NOTNULL(w->bereq, HTTP_MAGIC);
-		CHECK_OBJ_NOTNULL(w->beresp, HTTP_MAGIC);
+		CHECK_OBJ_NOTNULL(w->x_bereq, HTTP_MAGIC);
+		CHECK_OBJ_NOTNULL(w->x_beresp, HTTP_MAGIC);
 		CHECK_OBJ_NOTNULL(w->resp, HTTP_MAGIC);
 
 		WS_Reset(w->ws, NULL);
@@ -267,8 +267,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			w->sp = NULL;
 
 			WS_Assert(w->ws);
-			AZ(w->bereq->ws);
-			AZ(w->beresp->ws);
+			AZ(w->busyobj);
 			AZ(w->resp->ws);
 			AZ(w->wrw.wfd);
 			AZ(w->storage_hint);
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 599ffbb..6e7efea 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -73,7 +73,7 @@ RFC2616_Ttl(const struct sess *sp)
 
 	expp = &sp->wrk->busyobj->exp;
 
-	hp = sp->wrk->beresp;
+	hp = sp->wrk->busyobj->beresp;
 
 	assert(expp->entered != 0.0 && !isnan(expp->entered));
 	/* If all else fails, cache using default ttl */
@@ -183,7 +183,7 @@ RFC2616_Body(const struct sess *sp)
 	struct http *hp;
 	char *b;
 
-	hp = sp->wrk->beresp;
+	hp = sp->wrk->busyobj->beresp;
 
 	if (hp->protover < 11 && !http_HdrIs(hp, H_Connection, "keep-alive"))
 		sp->wrk->busyobj->should_close = 1;
@@ -192,7 +192,7 @@ RFC2616_Body(const struct sess *sp)
 	else
 		sp->wrk->busyobj->should_close = 0;
 
-	if (!strcasecmp(http_GetReq(sp->wrk->bereq), "head")) {
+	if (!strcasecmp(http_GetReq(sp->wrk->busyobj->bereq), "head")) {
 		/*
 		 * A HEAD request can never have a body in the reply,
 		 * no matter what the headers might say.
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index bbf93b5..a696f64 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -100,10 +100,10 @@ vrt_selecthttp(const struct sess *sp, enum gethdr_e where)
 		hp = sp->http;
 		break;
 	case HDR_BEREQ:
-		hp = sp->wrk->bereq;
+		hp = sp->wrk->busyobj->bereq;
 		break;
 	case HDR_BERESP:
-		hp = sp->wrk->beresp;
+		hp = sp->wrk->busyobj->beresp;
 		break;
 	case HDR_RESP:
 		hp = sp->wrk->resp;
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index cb54837..0662e26 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -85,15 +85,15 @@ VRT_r_##obj##_##hdr(const struct sess *sp)			\
 VRT_DO_HDR(req,   request,	sp->http,		HTTP_HDR_REQ)
 VRT_DO_HDR(req,   url,		sp->http,		HTTP_HDR_URL)
 VRT_DO_HDR(req,   proto,	sp->http,		HTTP_HDR_PROTO)
-VRT_DO_HDR(bereq, request,	sp->wrk->bereq,		HTTP_HDR_REQ)
-VRT_DO_HDR(bereq, url,		sp->wrk->bereq,		HTTP_HDR_URL)
-VRT_DO_HDR(bereq, proto,	sp->wrk->bereq,		HTTP_HDR_PROTO)
+VRT_DO_HDR(bereq, request,	sp->wrk->busyobj->bereq,	HTTP_HDR_REQ)
+VRT_DO_HDR(bereq, url,		sp->wrk->busyobj->bereq,	HTTP_HDR_URL)
+VRT_DO_HDR(bereq, proto,	sp->wrk->busyobj->bereq,	HTTP_HDR_PROTO)
 VRT_DO_HDR(obj,   proto,	sp->wrk->obj->http,		HTTP_HDR_PROTO)
 VRT_DO_HDR(obj,   response,	sp->wrk->obj->http,		HTTP_HDR_RESPONSE)
 VRT_DO_HDR(resp,  proto,	sp->wrk->resp,		HTTP_HDR_PROTO)
 VRT_DO_HDR(resp,  response,	sp->wrk->resp,		HTTP_HDR_RESPONSE)
-VRT_DO_HDR(beresp,  proto,	sp->wrk->beresp,	HTTP_HDR_PROTO)
-VRT_DO_HDR(beresp,  response,	sp->wrk->beresp,	HTTP_HDR_RESPONSE)
+VRT_DO_HDR(beresp,  proto,	sp->wrk->busyobj->beresp,	HTTP_HDR_PROTO)
+VRT_DO_HDR(beresp,  response,	sp->wrk->busyobj->beresp,	HTTP_HDR_RESPONSE)
 
 /*--------------------------------------------------------------------*/
 
@@ -115,7 +115,7 @@ VRT_r_##obj##_status(const struct sess *sp)			\
 }
 
 VRT_DO_STATUS(obj, sp->wrk->obj->http)
-VRT_DO_STATUS(beresp, sp->wrk->beresp)
+VRT_DO_STATUS(beresp, sp->wrk->busyobj->beresp)
 VRT_DO_STATUS(resp, sp->wrk->resp)
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 1d80805..73eedb2 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -153,8 +153,8 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	w->wlb = w->wlp = wlog;
 	w->wle = wlog + (sizeof wlog) / 4;
 	w->sha256ctx = &sha256;
-	w->bereq = HTTP_create(http0, nhttp);
-	w->beresp = HTTP_create(http1, nhttp);
+	w->x_bereq = HTTP_create(http0, nhttp);
+	w->x_beresp = HTTP_create(http1, nhttp);
 	w->resp = HTTP_create(http2, nhttp);
 	w->wrw.iov = iov;
 	w->wrw.siov = siov;



From phk at varnish-cache.org  Wed Dec  7 10:32:14 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 07 Dec 2011 11:32:14 +0100
Subject: [master] 367c381 Missed part of last commit.
Message-ID: <E1RYEnO-0005cd-Jx@project.varnish-software.com>

commit 367c3817b1fef87cf3c008f0014415d1339c5812
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 7 10:31:56 2011 +0000

    Missed part of last commit.

diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 14d8503..fc371e7 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -192,7 +192,7 @@ vmod_collect(struct sess *sp, enum gethdr_e e, const char *h)
 	(void)h;
 	if (e == HDR_REQ)
 		http_CollectHdr(sp->http, h);
-	else if (e == HDR_BERESP)
-		http_CollectHdr(sp->wrk->beresp, h);
+	else if (e == HDR_BERESP && sp->wrk->busyobj != NULL)
+		http_CollectHdr(sp->wrk->busyobj->beresp, h);
 }
 



From phk at varnish-cache.org  Thu Dec  8 06:17:54 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 08 Dec 2011 07:17:54 +0100
Subject: [master] 0bcfeee Move busyobj to their own source file,
	they are not really backend related and will have somewhat complex
	semantics.
Message-ID: <E1RYXIo-0000nr-LH@project.varnish-software.com>

commit 0bcfeee0ae14213f4277b199dadaaab481b7273f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 8 06:17:22 2011 +0000

    Move busyobj to their own source file, they are not really
    backend related and will have somewhat complex semantics.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 2116701..a4bae7f 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -16,6 +16,7 @@ varnishd_SOURCES = \
 	cache/cache_backend_cfg.c \
 	cache/cache_backend_poll.c \
 	cache/cache_ban.c \
+	cache/cache_busyobj.c \
 	cache/cache_center.c \
 	cache/cache_cli.c \
 	cache/cache_dir.c \
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 24c1dc9..0ee855b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -673,12 +673,6 @@ void VDI_RecycleFd(struct worker *wrk, struct vbc **vbp);
 void VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc);
 void VBE_Poll(void);
 
-/* cache_backend.c */
-void VBE_Init(void);
-struct busyobj *VBE_GetBusyObj(struct worker *wrk);
-struct busyobj *VBE_RefBusyObj(struct busyobj *busyobj);
-void VBE_DerefBusyObj(struct worker *wrk, struct busyobj **busyobj);
-
 /* cache_backend_cfg.c */
 void VBE_InitCfg(void);
 struct backend *VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb);
@@ -703,6 +697,12 @@ struct ban *BAN_RefBan(struct objcore *oc, double t0, const struct ban *tail);
 void BAN_TailDeref(struct ban **ban);
 double BAN_Time(const struct ban *ban);
 
+/* cache_busyobj.c */
+void VBO_Init(void);
+struct busyobj *VBO_GetBusyObj(struct worker *wrk);
+struct busyobj *VBO_RefBusyObj(struct busyobj *busyobj);
+void VBO_DerefBusyObj(struct worker *wrk, struct busyobj **busyobj);
+
 /* cache_center.c [CNT] */
 void CNT_Session(struct sess *sp);
 void CNT_Init(void);
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index cf9d60f..4d2f18a 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -43,105 +43,6 @@
 #include "vrt.h"
 #include "vtcp.h"
 
-static struct lock nbusyobj_mtx;
-static struct busyobj *nbusyobj;
-
-void
-VBE_Init(void)
-{
-	Lck_New(&nbusyobj_mtx, lck_nbusyobj);
-	nbusyobj = NULL;
-}
-
-/*--------------------------------------------------------------------
- * BusyObj handling
- */
-
-static struct busyobj *
-vbe_NewBusyObj(void)
-{
-	struct busyobj *busyobj;
-
-	ALLOC_OBJ(busyobj, BUSYOBJ_MAGIC);
-	AN(busyobj);
-	Lck_New(&busyobj->mtx, lck_busyobj);
-	return (busyobj);
-}
-
-static void
-vbe_FreeBusyObj(struct busyobj *busyobj)
-{
-	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	AZ(busyobj->refcount);
-	Lck_Delete(&busyobj->mtx);
-	FREE_OBJ(busyobj);
-}
-
-struct busyobj *
-VBE_GetBusyObj(struct worker *wrk)
-{
-	struct busyobj *busyobj = NULL;
-
-	(void)wrk;
-	Lck_Lock(&nbusyobj_mtx);
-	if (nbusyobj != NULL) {
-		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
-		busyobj = nbusyobj;
-		nbusyobj = NULL;
-		memset((char *)busyobj + offsetof(struct busyobj, refcount), 0,
-		       sizeof *busyobj - offsetof(struct busyobj, refcount));
-	}
-	Lck_Unlock(&nbusyobj_mtx);
-	if (busyobj == NULL)
-		busyobj = vbe_NewBusyObj();
-	AN(busyobj);
-	busyobj->refcount = 1;
-	busyobj->beresp = wrk->x_beresp;
-	busyobj->bereq = wrk->x_bereq;
-	return (busyobj);
-}
-
-struct busyobj *
-VBE_RefBusyObj(struct busyobj *busyobj)
-{
-	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	Lck_Lock(&busyobj->mtx);
-	assert(busyobj->refcount > 0);
-	busyobj->refcount++;
-	Lck_Unlock(&busyobj->mtx);
-	return (busyobj);
-}
-
-void
-VBE_DerefBusyObj(struct worker *wrk, struct busyobj **pbo)
-{
-	struct busyobj *busyobj;
-
-	(void)wrk;
-	busyobj = *pbo;
-	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	Lck_Lock(&busyobj->mtx);
-	assert(busyobj->refcount > 0);
-	busyobj->refcount--;
-	*pbo = NULL;
-	if (busyobj->refcount > 0) {
-		Lck_Unlock(&busyobj->mtx);
-		return;
-	}
-	Lck_Unlock(&busyobj->mtx);
-
-	/* XXX Sanity checks e.g. AZ(busyobj->vbc) */
-
-	Lck_Lock(&nbusyobj_mtx);
-	if (nbusyobj == NULL) {
-		nbusyobj = busyobj;
-		busyobj = NULL;
-	}
-	Lck_Unlock(&nbusyobj_mtx);
-	if (busyobj != NULL)
-		vbe_FreeBusyObj(busyobj);
-}
-
 /*--------------------------------------------------------------------
  * The "simple" director really isn't, since thats where all the actual
  * connections happen.  Nontheless, pretend it is simple by sequestering
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
new file mode 100644
index 0000000..32bad7e
--- /dev/null
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -0,0 +1,138 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Handle backend connections and backend request structures.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include "cache.h"
+
+static struct lock nbusyobj_mtx;
+static struct busyobj *nbusyobj;
+
+void
+VBO_Init(void)
+{
+	Lck_New(&nbusyobj_mtx, lck_nbusyobj);
+	nbusyobj = NULL;
+}
+
+/*--------------------------------------------------------------------
+ * BusyObj handling
+ */
+
+static struct busyobj *
+vbo_NewBusyObj(void)
+{
+	struct busyobj *busyobj;
+
+	ALLOC_OBJ(busyobj, BUSYOBJ_MAGIC);
+	AN(busyobj);
+	Lck_New(&busyobj->mtx, lck_busyobj);
+	return (busyobj);
+}
+
+static void
+vbe_FreeBusyObj(struct busyobj *busyobj)
+{
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	AZ(busyobj->refcount);
+	Lck_Delete(&busyobj->mtx);
+	FREE_OBJ(busyobj);
+}
+
+struct busyobj *
+VBO_GetBusyObj(struct worker *wrk)
+{
+	struct busyobj *busyobj = NULL;
+
+	(void)wrk;
+	Lck_Lock(&nbusyobj_mtx);
+	if (nbusyobj != NULL) {
+		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
+		busyobj = nbusyobj;
+		nbusyobj = NULL;
+		memset((char *)busyobj + offsetof(struct busyobj, refcount), 0,
+		       sizeof *busyobj - offsetof(struct busyobj, refcount));
+	}
+	Lck_Unlock(&nbusyobj_mtx);
+	if (busyobj == NULL)
+		busyobj = vbo_NewBusyObj();
+	AN(busyobj);
+	busyobj->refcount = 1;
+	busyobj->beresp = wrk->x_beresp;
+	busyobj->bereq = wrk->x_bereq;
+	return (busyobj);
+}
+
+struct busyobj *
+VBO_RefBusyObj(struct busyobj *busyobj)
+{
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	Lck_Lock(&busyobj->mtx);
+	assert(busyobj->refcount > 0);
+	busyobj->refcount++;
+	Lck_Unlock(&busyobj->mtx);
+	return (busyobj);
+}
+
+void
+VBO_DerefBusyObj(struct worker *wrk, struct busyobj **pbo)
+{
+	struct busyobj *busyobj;
+
+	(void)wrk;
+	busyobj = *pbo;
+	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
+	Lck_Lock(&busyobj->mtx);
+	assert(busyobj->refcount > 0);
+	busyobj->refcount--;
+	*pbo = NULL;
+	if (busyobj->refcount > 0) {
+		Lck_Unlock(&busyobj->mtx);
+		return;
+	}
+	Lck_Unlock(&busyobj->mtx);
+
+	/* XXX Sanity checks e.g. AZ(busyobj->vbc) */
+
+	Lck_Lock(&nbusyobj_mtx);
+	if (nbusyobj == NULL) {
+		nbusyobj = busyobj;
+		busyobj = NULL;
+	}
+	Lck_Unlock(&nbusyobj_mtx);
+	if (busyobj != NULL)
+		vbe_FreeBusyObj(busyobj);
+}
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 442e2bb..8826ae2 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -255,7 +255,7 @@ cnt_prepresp(struct sess *sp)
 			AN(wrk->busyobj->do_stream);
 			VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 			HSH_Drop(wrk);
-			VBE_DerefBusyObj(wrk, &wrk->busyobj);
+			VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		} else {
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
 		}
@@ -464,7 +464,7 @@ cnt_error(struct sess *sp)
 	if (wrk->obj == NULL) {
 		HSH_Prealloc(sp);
 		AZ(wrk->busyobj);
-		wrk->busyobj = VBE_GetBusyObj(wrk);
+		wrk->busyobj = VBO_GetBusyObj(wrk);
 		wrk->obj = STV_NewObject(wrk, NULL, cache_param->http_resp_size,
 		     (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL)
@@ -508,7 +508,7 @@ cnt_error(struct sess *sp)
 	if (sp->handling == VCL_RET_RESTART &&
 	    sp->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->director = NULL;
 		sp->restarts++;
 		sp->step = STP_RECV;
@@ -525,7 +525,7 @@ cnt_error(struct sess *sp)
 	sp->err_code = 0;
 	sp->err_reason = NULL;
 	http_Setup(wrk->busyobj->bereq, NULL);
-	VBE_DerefBusyObj(wrk, &wrk->busyobj);
+	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_PREPRESP;
 	return (0);
 }
@@ -654,7 +654,7 @@ cnt_fetch(struct sess *sp)
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 	}
-	VBE_DerefBusyObj(wrk, &wrk->busyobj);
+	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->director = NULL;
 	wrk->storage_hint = NULL;
 
@@ -827,7 +827,7 @@ cnt_fetchbody(struct sess *sp)
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		return (0);
 	}
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
@@ -896,7 +896,7 @@ cnt_fetchbody(struct sess *sp)
 
 	if (i) {
 		HSH_Drop(wrk);
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		AZ(wrk->obj);
 		sp->err_code = 503;
 		sp->step = STP_ERROR;
@@ -909,7 +909,7 @@ cnt_fetchbody(struct sess *sp)
 		AN(wrk->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	}
-	VBE_DerefBusyObj(wrk, &wrk->busyobj);
+	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	wrk->acct_tmp.fetch++;
 	sp->step = STP_PREPRESP;
 	return (0);
@@ -983,7 +983,7 @@ cnt_streambody(struct sess *sp)
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
-	VBE_DerefBusyObj(wrk, &wrk->busyobj);
+	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	http_Setup(wrk->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
@@ -1253,7 +1253,7 @@ cnt_miss(struct sess *sp)
 	AN(wrk->objcore);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	WS_Reset(wrk->ws, NULL);
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_FETCH);
 	http_ForceGet(wrk->busyobj->bereq);
@@ -1278,13 +1278,13 @@ cnt_miss(struct sess *sp)
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
 		http_Setup(wrk->busyobj->bereq, NULL);
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_PASS:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_PASS;
 		return (0);
 	case VCL_RET_FETCH:
@@ -1294,7 +1294,7 @@ cnt_miss(struct sess *sp)
 	case VCL_RET_RESTART:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		INCOMPL();
 	default:
 		WRONG("Illegal action in vcl_miss{}");
@@ -1345,9 +1345,9 @@ cnt_pass(struct sess *sp)
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PASS);
 
@@ -1357,7 +1357,7 @@ cnt_pass(struct sess *sp)
 	VCL_pass_method(sp);
 	if (sp->handling == VCL_RET_ERROR) {
 		http_Setup(wrk->busyobj->bereq, NULL);
-		VBE_DerefBusyObj(wrk, &wrk->busyobj);
+		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -1405,9 +1405,9 @@ cnt_pipe(struct sess *sp)
 	AZ(wrk->busyobj);
 
 	wrk->acct_tmp.pipe++;
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 	WS_Reset(wrk->ws, NULL);
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 	http_Setup(wrk->busyobj->bereq, wrk->ws);
 	http_FilterHeader(sp, HTTPH_R_PIPE);
 
@@ -1420,7 +1420,7 @@ cnt_pipe(struct sess *sp)
 	PipeSession(sp);
 	assert(WRW_IsReleased(wrk));
 	http_Setup(wrk->busyobj->bereq, NULL);
-	VBE_DerefBusyObj(wrk, &wrk->busyobj);
+	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_DONE;
 	return (0);
 }
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 8a73f6c..675afea 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -452,7 +452,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	oc->refcnt = 1;
 
 	AZ(wrk->busyobj);
-	wrk->busyobj = VBE_GetBusyObj(wrk);
+	wrk->busyobj = VBO_GetBusyObj(wrk);
 
 	VRY_Validate(sp->vary_b);
 	if (sp->vary_l != NULL)
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index fbe7624..a10b0fe 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -117,7 +117,7 @@ child_main(void)
 
 	HTTP_Init();
 
-	VBE_Init();
+	VBO_Init();
 	VBE_InitCfg();
 	VBP_Init();
 	WRK_Init();



From phk at varnish-cache.org  Thu Dec  8 07:13:45 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 08 Dec 2011 08:13:45 +0100
Subject: [master] 0dd1ee2 Complete the busyobj management code by adding a
	(default-on) per worker cache and a wrapper structure (needed
	for $param sized elements) and two new stats counters.
Message-ID: <E1RYYAr-0002OW-Mh@project.varnish-software.com>

commit 0dd1ee21b69f043ad55219c592454d17dd8739db
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 8 07:12:33 2011 +0000

    Complete the busyobj management code by adding a (default-on) per
    worker cache and a wrapper structure (needed for $param sized elements)
    and two new stats counters.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 0ee855b..4435c32 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -106,6 +106,7 @@ struct pool;
 struct sess;
 struct sesspool;
 struct vbc;
+struct vbo;
 struct vef_priv;
 struct vrt_backend;
 struct vsb;
@@ -293,7 +294,7 @@ struct worker {
 	struct objhead		*nobjhead;
 	struct objcore		*nobjcore;
 	struct waitinglist	*nwaitinglist;
-	/* struct busyobj		*nbusyobj; */
+	struct vbo		*nvbo;
 	void			*nhashpriv;
 	struct dstat		stats;
 
@@ -496,9 +497,7 @@ oc_getlru(const struct objcore *oc)
 struct busyobj {
 	unsigned		magic;
 #define BUSYOBJ_MAGIC		0x23b95567
-	struct lock		mtx;
-	/* Members passed this line are cleared on reuse */
-	unsigned		refcount;
+	struct vbo		*vbo;
 
 	uint8_t			*vary;
 	unsigned		is_gzip;
@@ -700,8 +699,9 @@ double BAN_Time(const struct ban *ban);
 /* cache_busyobj.c */
 void VBO_Init(void);
 struct busyobj *VBO_GetBusyObj(struct worker *wrk);
-struct busyobj *VBO_RefBusyObj(struct busyobj *busyobj);
+void VBO_RefBusyObj(const struct busyobj *busyobj);
 void VBO_DerefBusyObj(struct worker *wrk, struct busyobj **busyobj);
+void VBO_Free(struct vbo **vbo);
 
 /* cache_center.c [CNT] */
 void CNT_Session(struct sess *sp);
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 32bad7e..4272725 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -1,8 +1,8 @@
 /*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2011 Varnish Software AS
+ * Copyright (c) 2011 Varnish Software AS
  * All rights reserved.
  *
+ * Author: Martin Blix Grydeland <martin at varnish-software.com>
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,101 +38,141 @@
 
 #include "cache.h"
 
-static struct lock nbusyobj_mtx;
-static struct busyobj *nbusyobj;
+struct vbo {
+	unsigned		magic;
+#define VBO_MAGIC		0xde3d8223
+	struct lock		mtx;
+	unsigned		refcount;
+	struct busyobj		bo;
+};
+
+static struct lock vbo_mtx;
+static struct vbo *nvbo;
 
 void
 VBO_Init(void)
 {
-	Lck_New(&nbusyobj_mtx, lck_nbusyobj);
-	nbusyobj = NULL;
+	Lck_New(&vbo_mtx, lck_busyobj);
+	nvbo = NULL;
 }
 
 /*--------------------------------------------------------------------
  * BusyObj handling
  */
 
-static struct busyobj *
-vbo_NewBusyObj(void)
+static struct vbo *
+vbo_New(void)
 {
-	struct busyobj *busyobj;
+	struct vbo *vbo;
 
-	ALLOC_OBJ(busyobj, BUSYOBJ_MAGIC);
-	AN(busyobj);
-	Lck_New(&busyobj->mtx, lck_busyobj);
-	return (busyobj);
+	ALLOC_OBJ(vbo, VBO_MAGIC);
+	AN(vbo);
+	Lck_New(&vbo->mtx, lck_busyobj);
+	return (vbo);
 }
 
-static void
-vbe_FreeBusyObj(struct busyobj *busyobj)
+void
+VBO_Free(struct vbo **vbop)
 {
-	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	AZ(busyobj->refcount);
-	Lck_Delete(&busyobj->mtx);
-	FREE_OBJ(busyobj);
+	struct vbo *vbo;
+
+	AN(vbop);
+	vbo = *vbop;
+	*vbop = NULL;
+	CHECK_OBJ_NOTNULL(vbo, VBO_MAGIC);
+	AZ(vbo->refcount);
+	Lck_Delete(&vbo->mtx);
+	FREE_OBJ(vbo);
 }
 
 struct busyobj *
 VBO_GetBusyObj(struct worker *wrk)
 {
-	struct busyobj *busyobj = NULL;
-
-	(void)wrk;
-	Lck_Lock(&nbusyobj_mtx);
-	if (nbusyobj != NULL) {
-		CHECK_OBJ_NOTNULL(nbusyobj, BUSYOBJ_MAGIC);
-		busyobj = nbusyobj;
-		nbusyobj = NULL;
-		memset((char *)busyobj + offsetof(struct busyobj, refcount), 0,
-		       sizeof *busyobj - offsetof(struct busyobj, refcount));
+	struct vbo *vbo = NULL;
+
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+
+	if (wrk->nvbo != NULL) {
+		vbo = wrk->nvbo;
+		wrk->nvbo = NULL;
+	}
+
+	if (vbo == NULL) {
+		Lck_Lock(&vbo_mtx);
+
+		vbo = nvbo;
+		nvbo = NULL;
+
+		if (vbo == NULL)
+			VSC_C_main->busyobj_alloc++;
+
+		Lck_Unlock(&vbo_mtx);
 	}
-	Lck_Unlock(&nbusyobj_mtx);
-	if (busyobj == NULL)
-		busyobj = vbo_NewBusyObj();
-	AN(busyobj);
-	busyobj->refcount = 1;
-	busyobj->beresp = wrk->x_beresp;
-	busyobj->bereq = wrk->x_bereq;
-	return (busyobj);
+
+	if (vbo == NULL)
+		vbo = vbo_New();
+
+	CHECK_OBJ_NOTNULL(vbo, VBO_MAGIC);
+	AZ(vbo->refcount);
+	AZ(vbo->bo.magic);
+	vbo->refcount = 1;
+	vbo->bo.magic = BUSYOBJ_MAGIC;
+	vbo->bo.vbo = vbo;
+	vbo->bo.beresp = wrk->x_beresp;
+	vbo->bo.bereq = wrk->x_bereq;
+	return (&vbo->bo);
 }
 
-struct busyobj *
-VBO_RefBusyObj(struct busyobj *busyobj)
+void
+VBO_RefBusyObj(const struct busyobj *busyobj)
 {
+	struct vbo *vbo;
+
 	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	Lck_Lock(&busyobj->mtx);
-	assert(busyobj->refcount > 0);
-	busyobj->refcount++;
-	Lck_Unlock(&busyobj->mtx);
-	return (busyobj);
+	vbo = busyobj->vbo;
+	CHECK_OBJ_NOTNULL(vbo, VBO_MAGIC);
+	Lck_Lock(&vbo->mtx);
+	assert(vbo->refcount > 0);
+	vbo->refcount++;
+	Lck_Unlock(&vbo->mtx);
 }
 
 void
 VBO_DerefBusyObj(struct worker *wrk, struct busyobj **pbo)
 {
-	struct busyobj *busyobj;
+	struct busyobj *bo;
+	struct vbo *vbo;
+	unsigned r;
 
-	(void)wrk;
-	busyobj = *pbo;
-	CHECK_OBJ_NOTNULL(busyobj, BUSYOBJ_MAGIC);
-	Lck_Lock(&busyobj->mtx);
-	assert(busyobj->refcount > 0);
-	busyobj->refcount--;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	AN(pbo);
+	bo = *pbo;
 	*pbo = NULL;
-	if (busyobj->refcount > 0) {
-		Lck_Unlock(&busyobj->mtx);
-		return;
-	}
-	Lck_Unlock(&busyobj->mtx);
-
-	/* XXX Sanity checks e.g. AZ(busyobj->vbc) */
-
-	Lck_Lock(&nbusyobj_mtx);
-	if (nbusyobj == NULL) {
-		nbusyobj = busyobj;
-		busyobj = NULL;
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	vbo = bo->vbo;
+	CHECK_OBJ_NOTNULL(vbo, VBO_MAGIC);
+	Lck_Lock(&vbo->mtx);
+	assert(vbo->refcount > 0);
+	r = --vbo->refcount;
+	Lck_Unlock(&vbo->mtx);
+
+	if (r == 0) {
+		/* XXX: Sanity checks & cleanup */
+		memset(&vbo->bo, 0, sizeof vbo->bo);
+
+		if (cache_param->bo_cache && wrk->nvbo == NULL) {
+			wrk->nvbo = vbo;
+		} else {
+			Lck_Lock(&vbo_mtx);
+			if (nvbo == NULL) {
+				nvbo = vbo;
+				vbo = NULL;
+			} else
+				VSC_C_main->busyobj_free++;
+			Lck_Unlock(&vbo_mtx);
+
+			if (vbo != NULL)
+				VBO_Free(&vbo);
+		}
 	}
-	Lck_Unlock(&nbusyobj_mtx);
-	if (busyobj != NULL)
-		vbe_FreeBusyObj(busyobj);
 }
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 675afea..6f6a85f 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -134,10 +134,8 @@ HSH_Cleanup(struct worker *wrk)
 		free(wrk->nhashpriv);
 		wrk->nhashpriv = NULL;
 	}
-	/* if (wrk->nbusyobj != NULL) { */
-	/* 	FREE_OBJ(wrk->nbusyobj); */
-	/* 	wrk->nbusyobj = NULL; */
-	/* } */
+	if (wrk->nvbo != NULL)
+		VBO_Free(&wrk->nvbo);
 }
 
 void
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index b9b758f..8fd777f 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -189,6 +189,8 @@ struct params {
 
 	struct vre_limits	vre_limits;
 
+	unsigned		bo_cache;
+
 	/* VSM dimensions */
 	ssize_t			vsm_space;
 	ssize_t			vsl_space;
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index e4be5d8..cc14e41 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1105,6 +1105,14 @@ static const struct parspec input_parspec[] = {
 		MUST_RESTART,
 		"1M", "bytes"},
 
+	{ "busyobj_worker_cache", tweak_bool,
+		&mgt_param.bo_cache, 0, 0,
+		"Cache free busyobj per worker thread."
+		"Disable this if you have very high hitrates and want"
+		"to save the memory of one busyobj per worker thread.",
+		0,
+		"true", ""},
+
 	{ NULL, NULL, NULL }
 };
 
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index a04767d..ab8415c 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -235,6 +235,20 @@ VSC_F(sess_dropped,		uint64_t, 1, 'c',
 	"  See also param queue_max."
 )
 
+/*---------------------------------------------------------------------
+ * BusyObj
+ */
+
+VSC_F(busyobj_alloc,		uint64_t, 1, 'c',
+    "Busyobj allocations",
+	"Number of busyobj structures allocated."
+)
+
+VSC_F(busyobj_free,		uint64_t, 1, 'c',
+    "Busyobj freed",
+	"Number of busyobj structures freed."
+)
+
 /*---------------------------------------------------------------------*/
 
 VSC_F(n_sess_mem,		uint64_t, 0, 'i', "N struct sess_mem", "")



From phk at varnish-cache.org  Thu Dec  8 07:45:35 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 08 Dec 2011 08:45:35 +0100
Subject: [master] d6b6428 Move the beresp and bereq from worker ot busyobj for
	good.
Message-ID: <E1RYYff-000672-AV@project.varnish-software.com>

commit d6b64285f179f8d6a66f29c60357f9c33cabb95c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 8 07:45:21 2011 +0000

    Move the beresp and bereq from worker ot busyobj for good.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 4435c32..ed6a3fd 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -328,10 +328,6 @@ struct worker {
 	/* This is only here so VRT can find it */
 	const char		*storage_hint;
 
-	/* Fetch stuff.  Here because pipe has no busyobj */
-	struct http		*x_bereq;
-	struct http		*x_beresp;
-
 	/* Stream state */
 	struct stream_ctx	*sctx;
 
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 4272725..ab4db76 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -43,6 +43,7 @@ struct vbo {
 #define VBO_MAGIC		0xde3d8223
 	struct lock		mtx;
 	unsigned		refcount;
+	uint16_t		nhttp;
 	struct busyobj		bo;
 };
 
@@ -64,9 +65,20 @@ static struct vbo *
 vbo_New(void)
 {
 	struct vbo *vbo;
+	uint16_t nhttp;
+	ssize_t http_space;
 
-	ALLOC_OBJ(vbo, VBO_MAGIC);
+	assert(cache_param->http_max_hdr < 65536);
+	nhttp = (uint16_t)cache_param->http_max_hdr;
+
+	http_space = HTTP_estimate(nhttp);
+
+	vbo = malloc(sizeof *vbo + 2 * http_space);
 	AN(vbo);
+
+	memset(vbo, 0, sizeof *vbo);
+	vbo->magic = VBO_MAGIC;
+	vbo->nhttp = nhttp;
 	Lck_New(&vbo->mtx, lck_busyobj);
 	return (vbo);
 }
@@ -89,6 +101,7 @@ struct busyobj *
 VBO_GetBusyObj(struct worker *wrk)
 {
 	struct vbo *vbo = NULL;
+	char *p;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
@@ -109,17 +122,25 @@ VBO_GetBusyObj(struct worker *wrk)
 		Lck_Unlock(&vbo_mtx);
 	}
 
+	if (vbo != NULL && vbo->nhttp != cache_param->http_max_hdr)
+		VBO_Free(&vbo);
+
 	if (vbo == NULL)
 		vbo = vbo_New();
 
 	CHECK_OBJ_NOTNULL(vbo, VBO_MAGIC);
 	AZ(vbo->refcount);
+
 	AZ(vbo->bo.magic);
 	vbo->refcount = 1;
 	vbo->bo.magic = BUSYOBJ_MAGIC;
 	vbo->bo.vbo = vbo;
-	vbo->bo.beresp = wrk->x_beresp;
-	vbo->bo.bereq = wrk->x_bereq;
+
+	p = (void*)(vbo + 1);
+	vbo->bo.bereq = HTTP_create(p, vbo->nhttp);
+	p += HTTP_estimate(vbo->nhttp);
+	vbo->bo.beresp = HTTP_create(p, vbo->nhttp);
+
 	return (&vbo->bo);
 }
 
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index cf40e85..a3cb805 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -196,8 +196,6 @@ Pool_Work_Thread(void *priv, struct worker *w)
 		Lck_AssertHeld(&pp->mtx);
 
 		CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-		CHECK_OBJ_NOTNULL(w->x_bereq, HTTP_MAGIC);
-		CHECK_OBJ_NOTNULL(w->x_beresp, HTTP_MAGIC);
 		CHECK_OBJ_NOTNULL(w->resp, HTTP_MAGIC);
 
 		WS_Reset(w->ws, NULL);
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 73eedb2..6b1d9dd 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -139,8 +139,6 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	uint32_t wlog[shm_workspace / 4];
 	/* XXX: can we trust these to be properly aligned ? */
 	unsigned char ws[sess_workspace];
-	unsigned char http0[http_space];
-	unsigned char http1[http_space];
 	unsigned char http2[http_space];
 	struct iovec iov[siov];
 	struct SHA256Context sha256;
@@ -153,8 +151,6 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	w->wlb = w->wlp = wlog;
 	w->wle = wlog + (sizeof wlog) / 4;
 	w->sha256ctx = &sha256;
-	w->x_bereq = HTTP_create(http0, nhttp);
-	w->x_beresp = HTTP_create(http1, nhttp);
 	w->resp = HTTP_create(http2, nhttp);
 	w->wrw.iov = iov;
 	w->wrw.siov = siov;



From phk at varnish-cache.org  Thu Dec  8 08:01:23 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 08 Dec 2011 09:01:23 +0100
Subject: [master] e541ffb Use the busyobj->vbc also for pipe,
	so that panic can see it.
Message-ID: <E1RYYux-00087C-I1@project.varnish-software.com>

commit e541ffbd0e75dfa163ea6dabfe426d905a5cb81a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 8 08:01:08 2011 +0000

    Use the busyobj->vbc also for pipe, so that panic can see it.

diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 8963fb7..cc98fba 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -69,11 +69,13 @@ PipeSession(struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->wrk->busyobj, BUSYOBJ_MAGIC);
 	w = sp->wrk;
 
 	vc = VDI_GetFd(NULL, sp);
 	if (vc == NULL)
 		return;
+	sp->wrk->busyobj->vbc = vc;		/* For panic dumping */
 	(void)VTCP_blocking(vc->fd);
 
 	WRW_Reserve(w, &vc->fd);
@@ -129,4 +131,5 @@ PipeSession(struct sess *sp)
 	}
 	SES_Close(sp, "pipe");
 	VDI_CloseFd(sp->wrk, &vc);
+	sp->wrk->busyobj->vbc = NULL;
 }



From phk at varnish-cache.org  Thu Dec  8 08:29:25 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 08 Dec 2011 09:29:25 +0100
Subject: [master] dcd622d Split long line
Message-ID: <E1RYZM5-0002HL-42@project.varnish-software.com>

commit dcd622df236dfa496b4565eeff9555ad7f37fae5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 8 08:29:19 2011 +0000

    Split long line

diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index b4863a8..f6be13d 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -161,7 +161,8 @@ vwp_main(void *priv)
 				VTAILQ_REMOVE(&vwp->sesshead, sp, list);
 				if (i == 0) {
 					/* Mov to front of list for speed */
-					VTAILQ_INSERT_HEAD(&vwp->sesshead, sp, list);
+					VTAILQ_INSERT_HEAD(&vwp->sesshead,
+					    sp, list);
 				} else {
 					vwp_unpoll(vwp, fd);
 					SES_Handle(sp, i);



From phk at varnish-cache.org  Mon Dec 12 11:57:21 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 12 Dec 2011 12:57:21 +0100
Subject: [master] 03e0bcf Write some generic code for a memory pool and apply
	it it VBC as the initial guineapig.
Message-ID: <E1Ra4VV-000380-1v@project.varnish-software.com>

commit 03e0bcf1beebc82633cbba0a861060a650288058
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 12 11:54:59 2011 +0000

    Write some generic code for a memory pool and apply it it VBC as
    the initial guineapig.
    
    We have a number of pools of objects we maintain dynamically and we
    will get more in the future, so having a generic facility makes sense.
    
    One particular aspect of some of our pools, is that the desired size
    of object is variable over time, for instance workspaces which
    depend on parameters etc.
    
    Using generic code will allow us to use systematic parameters and
    VSC stats for all pools, hopefully with some memory savings involved.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index a4bae7f..0c3427e 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -34,6 +34,7 @@ varnishd_SOURCES = \
 	cache/cache_httpconn.c \
 	cache/cache_lck.c \
 	cache/cache_main.c \
+	cache/cache_mempool.c \
 	cache/cache_panic.c \
 	cache/cache_pipe.c \
 	cache/cache_pool.c \
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ed6a3fd..edfe75f 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -99,10 +99,12 @@ struct cli;
 struct cli_proto;
 struct director;
 struct iovec;
+struct mempool;
 struct objcore;
 struct object;
 struct objhead;
 struct pool;
+struct poolparam;
 struct sess;
 struct sesspool;
 struct vbc;
@@ -667,6 +669,7 @@ void VDI_CloseFd(struct worker *wrk, struct vbc **vbp);
 void VDI_RecycleFd(struct worker *wrk, struct vbc **vbp);
 void VDI_AddHostHeader(struct worker *wrk, const struct vbc *vbc);
 void VBE_Poll(void);
+void VDI_Init(void);
 
 /* cache_backend_cfg.c */
 void VBE_InitCfg(void);
@@ -849,6 +852,15 @@ int Lck_CondWait(pthread_cond_t *cond, struct lock *lck, struct timespec *ts);
 #include "tbl/locks.h"
 #undef LOCK
 
+/* cache_mempool.c */
+struct mempool * MPL_New(const char *name, struct lock *mtx,
+    volatile struct poolparam *pp, volatile unsigned *cur_size);
+void *MPL_GetLocked(struct mempool *mpl, unsigned *size);
+void *MPL_Get(struct mempool *mpl, unsigned *size);
+void MPL_FreeLocked(struct mempool *mpl, void *item);
+void MPL_Free(struct mempool *mpl, void *item);
+
+
 /* cache_panic.c */
 void PAN_Init(void);
 
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 4d2f18a..333b9bf 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -43,6 +43,16 @@
 #include "vrt.h"
 #include "vtcp.h"
 
+static struct mempool	*vbcpool;
+
+static struct poolparam vbcpp = {
+	.min_pool	= 10,
+	.max_pool	= 100,
+	.max_age	= 60,
+};
+
+static unsigned		vbcps = sizeof(struct vbc);
+
 /*--------------------------------------------------------------------
  * The "simple" director really isn't, since thats where all the actual
  * connections happen.  Nontheless, pretend it is simple by sequestering
@@ -82,14 +92,7 @@ VBE_ReleaseConn(struct vbc *vc)
 	CHECK_OBJ_NOTNULL(vc, VBC_MAGIC);
 	assert(vc->backend == NULL);
 	assert(vc->fd < 0);
-
-	vc->addr = NULL;
-	vc->addrlen = 0;
-	vc->recycled = 0;
-	Lck_Lock(&VBE_mtx);
-	VSC_C_main->n_vbc--;
-	Lck_Unlock(&VBE_mtx);
-	FREE_OBJ(vc);
+	MPL_Free(vbcpool, vc);
 }
 
 #define FIND_TMO(tmx, dst, sp, be)		\
@@ -221,12 +224,10 @@ vbe_NewConn(void)
 {
 	struct vbc *vc;
 
-	ALLOC_OBJ(vc, VBC_MAGIC);
+	vc = MPL_Get(vbcpool, NULL);
 	XXXAN(vc);
+	vc->magic = VBC_MAGIC;
 	vc->fd = -1;
-	Lck_Lock(&VBE_mtx);
-	VSC_C_main->n_vbc++;
-	Lck_Unlock(&VBE_mtx);
 	return (vc);
 }
 
@@ -517,3 +518,11 @@ VRT_init_dir_simple(struct cli *cli, struct director **bp, int idx,
 
 	bp[idx] = &vs->dir;
 }
+
+void
+VDI_Init(void)
+{
+
+	vbcpool = MPL_New("vbc", NULL, &vbcpp, &vbcps);
+	AN(vbcpool);
+}
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 72a1283..a3ae5c2 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -170,7 +170,6 @@ void VBE_ReleaseConn(struct vbc *vc);
 struct backend *vdi_get_backend_if_simple(const struct director *d);
 
 /* cache_backend_cfg.c */
-extern struct lock VBE_mtx;
 void VBE_DropRefConn(struct backend *);
 void VBE_DropRefVcl(struct backend *);
 void VBE_DropRefLocked(struct backend *b);
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index a47aa3c..c2d022d 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -43,9 +43,6 @@
 #include "vcli_priv.h"
 #include "vrt.h"
 
-struct lock VBE_mtx;
-
-
 /*
  * The list of backends is not locked, it is only ever accessed from
  * the CLI thread, so there is no need.
@@ -502,6 +499,5 @@ void
 VBE_InitCfg(void)
 {
 
-	Lck_New(&VBE_mtx, lck_vbe);
 	CLI_AddFuncs(backend_cmds);
 }
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index a10b0fe..2189104 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -117,6 +117,7 @@ child_main(void)
 
 	HTTP_Init();
 
+	VDI_Init();
 	VBO_Init();
 	VBE_InitCfg();
 	VBP_Init();
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
new file mode 100644
index 0000000..6677c84
--- /dev/null
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -0,0 +1,164 @@
+/*-
+ * Copyright (c) 2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Generic memory pool
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "config.h"
+
+#include "cache.h"
+
+struct memitem {
+	unsigned			magic;
+#define MEMITEM_MAGIC			0x42e55401
+	VTAILQ_ENTRY(memitem)		list;
+	unsigned			size;
+	double				payload;
+};
+
+struct mempool {
+	unsigned			magic;
+#define MEMPOOL_MAGIC			0x37a75a8d
+	VTAILQ_HEAD(,memitem)		list;
+	struct lock			*mtx;
+	struct lock			imtx;
+	const char			*name;
+	volatile struct poolparam	*param;
+	volatile unsigned		*cur_size;
+	struct VSC_C_mempool		*vsc;
+};
+
+struct mempool *
+MPL_New(const char *name,
+	struct lock *mtx,
+	volatile struct poolparam *pp,
+	volatile unsigned *cur_size)
+{
+	struct mempool *mpl;
+
+	ALLOC_OBJ(mpl, MEMPOOL_MAGIC);
+	AN(mpl);
+	mpl->name = name;
+	mpl->param = pp;
+	mpl->cur_size = cur_size;
+	mpl->mtx = mtx;
+	VTAILQ_INIT(&mpl->list);
+	Lck_New(&mpl->imtx, lck_mempool);
+	if (mpl->mtx == NULL)
+		mpl->mtx = &mpl->imtx;
+	/* XXX: prealloc min_pool */
+	mpl->vsc = VSM_Alloc(sizeof *mpl->vsc,
+	    VSC_CLASS, VSC_TYPE_MEMPOOL, name);
+	AN(mpl->vsc);
+	return (mpl);
+}
+
+void *
+MPL_GetLocked(struct mempool *mpl, unsigned *size)
+{
+	struct memitem *mi;
+	unsigned tsz;
+
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	Lck_AssertHeld(mpl->mtx);
+
+	mpl->vsc->allocs++;
+	mpl->vsc->live++;
+	do {
+		mi = VTAILQ_FIRST(&mpl->list);
+		if (mi == NULL)
+			break;
+		mpl->vsc->pool--;
+		CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+		VTAILQ_REMOVE(&mpl->list, mi, list);
+		if (mi->size < *mpl->cur_size) {
+			mpl->vsc->toosmall++;
+			FREE_OBJ(mi);
+			mi = NULL;
+		} else {
+			mpl->vsc->recycle++;
+		}
+	} while (mi == NULL);
+	if (mi == NULL) {
+		tsz = *mpl->cur_size;
+		mi = calloc(sizeof *mi + tsz, 1);
+		AN(mi);
+		mi->magic = MEMITEM_MAGIC;
+		mi->size = tsz;
+	}
+	if (size != NULL)
+		*size = mi->size;
+	return (&mi->payload);
+}
+
+void
+MPL_FreeLocked(struct mempool *mpl, void *item)
+{
+	struct memitem *mi;
+
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	Lck_AssertHeld(mpl->mtx);
+
+	mpl->vsc->frees++;
+	mpl->vsc->live--;
+
+	mi = (void*)((uintptr_t)item - offsetof(struct memitem, payload));
+	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+
+	if (mi->size < *mpl->cur_size) {
+		mpl->vsc->toosmall++;
+		FREE_OBJ(mi);
+	} else {
+		mpl->vsc->pool++;
+		memset(item, 0, mi->size);
+		VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
+	}
+}
+
+void *
+MPL_Get(struct mempool *mpl, unsigned *size)
+{
+	void *p;
+
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	Lck_Lock(mpl->mtx);
+	p = MPL_GetLocked(mpl, size);
+	Lck_Unlock(mpl->mtx);
+	return (p);
+}
+
+void
+MPL_Free(struct mempool *mpl, void *item)
+{
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	Lck_Lock(mpl->mtx);
+	MPL_FreeLocked(mpl, item);
+	Lck_Unlock(mpl->mtx);
+}
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index 8fd777f..3f1821f 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -33,6 +33,12 @@
 
 #define VSM_CLASS_PARAM		"Params"
 
+struct poolparam {
+	unsigned		min_pool;
+	unsigned		max_pool;
+	double			max_age;
+};
+
 struct params {
 
 	/* Unprivileged user / group */
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index d86da01..697752d 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -46,9 +46,9 @@ LOCK(lru)
 LOCK(cli)
 LOCK(ban)
 LOCK(vbp)
-LOCK(vbe)
 LOCK(backend)
 LOCK(vcapace)
 LOCK(nbusyobj)
 LOCK(busyobj)
+LOCK(mempool)
 /*lint -restore */
diff --git a/include/tbl/vsc_all.h b/include/tbl/vsc_all.h
index 4d7b927..ae42507 100644
--- a/include/tbl/vsc_all.h
+++ b/include/tbl/vsc_all.h
@@ -56,3 +56,9 @@ VSC_DO(VBE, vbe, VSC_TYPE_VBE)
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_VBE
 VSC_DONE(VBE, vbe, VSC_TYPE_VBE)
+
+VSC_DO(MEMPOOL, mempool, VSC_TYPE_MEMPOOL)
+#define VSC_DO_MEMPOOL
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_MEMPOOL
+VSC_DONE(MEMPOOL, mempool, VSC_TYPE_MEMPOOL)
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index ab8415c..c8c4ecb 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -259,8 +259,6 @@ VSC_F(n_objectcore,		uint64_t, 1, 'i', "N struct objectcore", "")
 VSC_F(n_objecthead,		uint64_t, 1, 'i', "N struct objecthead", "")
 VSC_F(n_waitinglist,		uint64_t, 1, 'i', "N struct waitinglist", "")
 
-VSC_F(n_vbc,		uint64_t, 0, 'i', "N struct vbc", "")
-
 VSC_F(n_backend,		uint64_t, 0, 'i', "N backends", "")
 
 VSC_F(n_expired,		uint64_t, 0, 'i', "N expired objects", "")
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 60cde5d..cc72903 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -106,3 +106,15 @@ VSC_F(happy,		uint64_t, 0, 'b', "Happy health probes", "")
 
 #endif
 
+/**********************************************************************/
+#ifdef VSC_DO_MEMPOOL
+
+VSC_F(allocs,			uint64_t, 0, 'c', "Allocations", "")
+VSC_F(frees,			uint64_t, 0, 'c', "Frees", "")
+VSC_F(live,			uint64_t, 0, 'g', "In use", "")
+VSC_F(pool,			uint64_t, 0, 'g', "In Pool", "")
+VSC_F(recycle,			uint64_t, 0, 'g', "Recycled from pool", "")
+VSC_F(timeout,			uint64_t, 0, 'g', "Timed out from pool", "")
+VSC_F(toosmall,			uint64_t, 0, 'g', "Too small to recycle", "")
+
+#endif
diff --git a/include/vapi/vsc_int.h b/include/vapi/vsc_int.h
index 6ceb723..95346e3 100644
--- a/include/vapi/vsc_int.h
+++ b/include/vapi/vsc_int.h
@@ -28,13 +28,14 @@
  *
  */
 
-#define VSC_CLASS          "Stat"
+#define VSC_CLASS		"Stat"
 
 #define VSC_TYPE_MAIN		""
-#define VSC_TYPE_SMA	"SMA"
-#define VSC_TYPE_SMF	"SMF"
-#define VSC_TYPE_VBE	"VBE"
-#define VSC_TYPE_LCK	"LCK"
+#define VSC_TYPE_SMA		"SMA"
+#define VSC_TYPE_SMF		"SMF"
+#define VSC_TYPE_VBE		"VBE"
+#define VSC_TYPE_LCK		"LCK"
+#define VSC_TYPE_MEMPOOL	"MEMPOOL"
 
 #define VSC_F(n, t, l, f, e, d)	t n;
 



From apj at varnish-cache.org  Tue Dec 13 14:35:27 2011
From: apj at varnish-cache.org (Andreas Plesner Jacobsen)
Date: Tue, 13 Dec 2011 15:35:27 +0100
Subject: [master] 7f3b2a7 Correct ACL syntax
Message-ID: <E1RaTS3-0002WF-Fe@project.varnish-software.com>

commit 7f3b2a79dcc033d249811ff246fdb22dd8ece61d
Author: Andreas Plesner Jacobsen <apj at mutt.dk>
Date:   Tue Dec 13 15:35:03 2011 +0100

    Correct ACL syntax

diff --git a/doc/sphinx/tutorial/purging.rst b/doc/sphinx/tutorial/purging.rst
index cea1ccd..ecf0e96 100644
--- a/doc/sphinx/tutorial/purging.rst
+++ b/doc/sphinx/tutorial/purging.rst
@@ -29,7 +29,7 @@ following VCL in place::
 
   acl purge {
 	  "localhost";
-	  "192.168.55.0/24";
+	  "192.168.55.0"/24;
   }
   
   sub vcl_recv {



From phk at varnish-cache.org  Wed Dec 14 10:52:22 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 14 Dec 2011 11:52:22 +0100
Subject: [master] cf024ae Introduce a generic handler for memory pool
	parameters.
Message-ID: <E1RamRi-0001AA-Tc@project.varnish-software.com>

commit cf024ae0766179d693b6d5b0d74754134df54647
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 14 10:51:23 2011 +0000

    Introduce a generic handler for memory pool parameters.
    
    Minor improvements to a couple param-tweakers as consequence.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 333b9bf..c1bc055 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -45,12 +45,6 @@
 
 static struct mempool	*vbcpool;
 
-static struct poolparam vbcpp = {
-	.min_pool	= 10,
-	.max_pool	= 100,
-	.max_age	= 60,
-};
-
 static unsigned		vbcps = sizeof(struct vbc);
 
 /*--------------------------------------------------------------------
@@ -523,6 +517,6 @@ void
 VDI_Init(void)
 {
 
-	vbcpool = MPL_New("vbc", NULL, &vbcpp, &vbcps);
+	vbcpool = MPL_New("vbc", NULL, &cache_param->vbc_pool, &vbcps);
 	AN(vbcpool);
 }
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index 3f1821f..8198a78 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -200,4 +200,6 @@ struct params {
 	/* VSM dimensions */
 	ssize_t			vsm_space;
 	ssize_t			vsl_space;
+
+	struct poolparam	vbc_pool;
 };
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index cc14e41..fedc0d1 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -102,33 +102,49 @@ tweak_timeout(struct cli *cli, const struct parspec *par, const char *arg)
 	tweak_generic_timeout(cli, dest, arg);
 }
 
-static void
-tweak_timeout_double(struct cli *cli, const struct parspec *par,
-    const char *arg)
+/*--------------------------------------------------------------------*/
+
+static int
+tweak_generic_timeout_double(struct cli *cli, volatile double *dest,
+    const char *arg, double min, double max)
 {
-	volatile double *dest;
 	double u;
+	char *p;
 
-	dest = par->priv;
 	if (arg != NULL) {
-		u = strtod(arg, NULL);
-		if (u < par->min) {
+		p = NULL;
+		u = strtod(arg, &p);
+		if (*arg == '\0' || *p != '\0') {
+			VCLI_Out(cli, "Not a number(%s)\n", arg);
+			VCLI_SetResult(cli, CLIS_PARAM);
+			return (-1);
+		}
+		if (u < min) {
 			VCLI_Out(cli,
-			    "Timeout must be greater or equal to %.g\n",
-				 par->min);
+			    "Timeout must be greater or equal to %.g\n", min);
 			VCLI_SetResult(cli, CLIS_PARAM);
-			return;
+			return (-1);
 		}
-		if (u > par->max) {
+		if (u > max) {
 			VCLI_Out(cli,
-			    "Timeout must be less than or equal to %.g\n",
-				 par->max);
+			    "Timeout must be less than or equal to %.g\n", max);
 			VCLI_SetResult(cli, CLIS_PARAM);
-			return;
+			return (-1);
 		}
 		*dest = u;
 	} else
 		VCLI_Out(cli, "%.6f", *dest);
+	return (0);
+}
+
+static void
+tweak_timeout_double(struct cli *cli, const struct parspec *par,
+    const char *arg)
+{
+	volatile double *dest;
+
+	dest = par->priv;
+	(void)tweak_generic_timeout_double(cli, dest, arg, par->min, par->max);
 }
 
 /*--------------------------------------------------------------------*/
@@ -138,11 +154,19 @@ tweak_generic_double(struct cli *cli, const struct parspec *par,
     const char *arg)
 {
 	volatile double *dest;
+	char *p;
 	double u;
 
 	dest = par->priv;
 	if (arg != NULL) {
-		u = strtod(arg, NULL);
+		p = NULL;
+		u = strtod(arg, &p);
+		if (arg == '\0' || *p != '\0') {
+			VCLI_Out(cli,
+			    "Not a number (%s)\n", arg);
+			VCLI_SetResult(cli, CLIS_PARAM);
+			return;
+		}
 		if (u < par->min) {
 			VCLI_Out(cli,
 			    "Must be greater or equal to %.g\n",
@@ -206,26 +230,33 @@ tweak_bool(struct cli *cli, const struct parspec *par, const char *arg)
 
 /*--------------------------------------------------------------------*/
 
-void
+int
 tweak_generic_uint(struct cli *cli, volatile unsigned *dest, const char *arg,
     unsigned min, unsigned max)
 {
 	unsigned u;
+	char *p;
 
 	if (arg != NULL) {
+		p = NULL;
 		if (!strcasecmp(arg, "unlimited"))
 			u = UINT_MAX;
 		else
-			u = strtoul(arg, NULL, 0);
+			u = strtoul(arg, &p, 0);
+		if (*arg == '\0' || *p != '\0') {
+			VCLI_Out(cli, "Not a number (%s)\n", arg);
+			VCLI_SetResult(cli, CLIS_PARAM);
+			return (-1);
+		}
 		if (u < min) {
 			VCLI_Out(cli, "Must be at least %u\n", min);
 			VCLI_SetResult(cli, CLIS_PARAM);
-			return;
+			return (-1);
 		}
 		if (u > max) {
 			VCLI_Out(cli, "Must be no more than %u\n", max);
 			VCLI_SetResult(cli, CLIS_PARAM);
-			return;
+			return (-1);
 		}
 		*dest = u;
 	} else if (*dest == UINT_MAX) {
@@ -233,6 +264,7 @@ tweak_generic_uint(struct cli *cli, volatile unsigned *dest, const char *arg,
 	} else {
 		VCLI_Out(cli, "%u", *dest);
 	}
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/
@@ -243,7 +275,8 @@ tweak_uint(struct cli *cli, const struct parspec *par, const char *arg)
 	volatile unsigned *dest;
 
 	dest = par->priv;
-	tweak_generic_uint(cli, dest, arg, (uint)par->min, (uint)par->max);
+	(void)tweak_generic_uint(cli, dest, arg,
+	    (uint)par->min, (uint)par->max);
 }
 
 /*--------------------------------------------------------------------*/
@@ -554,6 +587,56 @@ tweak_diag_bitmap(struct cli *cli, const struct parspec *par, const char *arg)
 
 /*--------------------------------------------------------------------*/
 
+static void
+tweak_poolparam(struct cli *cli, const struct parspec *par, const char *arg)
+{
+	volatile struct poolparam *pp, px;
+	char **av;
+
+	pp = par->priv;
+	if (arg == NULL) {
+		VCLI_Out(cli, "%u,%u,%g",
+		    pp->min_pool, pp->max_pool, pp->max_age);
+	} else {
+		av = VAV_Parse(arg, NULL, ARGV_COMMA);
+		do {
+			if (av[0] != NULL) {
+				VCLI_Out(cli, "Parse error: %s", av[0]);
+				VCLI_SetResult(cli, CLIS_PARAM);
+				break;
+			}
+			if (av[1] == NULL || av[2] == NULL || av[3] == NULL) {
+				VCLI_Out(cli,
+				    "Three fields required:"
+				    " min_pool, max_pool and max_age\n");
+				VCLI_SetResult(cli, CLIS_PARAM);
+				break;
+			}
+			px = *pp;
+			if (tweak_generic_uint(cli, &px.min_pool, av[1],
+			    (uint)par->min, (uint)par->max))
+				break;
+			if (tweak_generic_uint(cli, &px.max_pool, av[2],
+			    (uint)par->min, (uint)par->max))
+				break;
+			if (tweak_generic_timeout_double(cli, &px.max_age,
+			    av[3], 0, 1e6))
+				break;
+			if (px.min_pool > px.max_pool) {
+				VCLI_Out(cli,
+				    "min_pool cannot be larger"
+				    " than max_pool\n");
+				VCLI_SetResult(cli, CLIS_PARAM);
+				break;
+			}
+			*pp = px;
+		} while(0);
+		
+	}
+}
+
+/*--------------------------------------------------------------------*/
+
 /*
  * Make sure to end all lines with either a space or newline of the
  * formatting will go haywire.
@@ -1113,6 +1196,15 @@ static const struct parspec input_parspec[] = {
 		0,
 		"true", ""},
 
+	{ "vbc_pool", tweak_poolparam, &mgt_param.vbc_pool, 0, 10000,
+		"Parameters for backend connection memory pool.\n"
+		"The three numbers are:\n"
+		"   min_pool -- minimum size of free pool.\n"
+		"   max_pool -- maximum size of free pool.\n"
+		"   max_age -- max age of free element.\n",
+		0,
+		"10,100,10", ""},
+
 	{ NULL, NULL, NULL }
 };
 
diff --git a/bin/varnishd/mgt/mgt_param.h b/bin/varnishd/mgt/mgt_param.h
index 2d4a97f..275dfe6 100644
--- a/bin/varnishd/mgt/mgt_param.h
+++ b/bin/varnishd/mgt/mgt_param.h
@@ -49,7 +49,7 @@ struct parspec {
 	const char	*units;
 };
 
-void tweak_generic_uint(struct cli *cli,
+int tweak_generic_uint(struct cli *cli,
     volatile unsigned *dest, const char *arg, unsigned min, unsigned max);
 void tweak_uint(struct cli *cli, const struct parspec *par, const char *arg);
 void tweak_timeout(struct cli *cli,
diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index badb3f4..e6320fd 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -59,7 +59,7 @@ tweak_thread_pool_min(struct cli *cli, const struct parspec *par,
     const char *arg)
 {
 
-	tweak_generic_uint(cli, &mgt_param.wthread_min, arg,
+	(void)tweak_generic_uint(cli, &mgt_param.wthread_min, arg,
 	    (unsigned)par->min, mgt_param.wthread_max);
 }
 
@@ -86,7 +86,7 @@ tweak_stack_size(struct cli *cli, const struct parspec *par,
 		arg = buf;
 	}
 
-	tweak_generic_uint(cli, &mgt_param.wthread_stacksize, arg,
+	(void)tweak_generic_uint(cli, &mgt_param.wthread_stacksize, arg,
 	    low, (uint)par->max);
 }
 
@@ -98,7 +98,7 @@ tweak_thread_pool_max(struct cli *cli, const struct parspec *par,
 {
 
 	(void)par;
-	tweak_generic_uint(cli, &mgt_param.wthread_max, arg,
+	(void)tweak_generic_uint(cli, &mgt_param.wthread_max, arg,
 	    mgt_param.wthread_min, UINT_MAX);
 }
 
diff --git a/bin/varnishtest/tests/b00034.vtc b/bin/varnishtest/tests/b00034.vtc
new file mode 100644
index 0000000..3579fcb
--- /dev/null
+++ b/bin/varnishtest/tests/b00034.vtc
@@ -0,0 +1,13 @@
+varnishtest "mempool param handling"
+
+server s1 {
+} -start
+
+varnish v1 -vcl+backend {}
+
+varnish v1 -cliok "param.set vbc_pool 1,10,1"
+varnish v1 -clierr 106 "param.set vbc_pool 10"
+varnish v1 -clierr 106 "param.set vbc_pool 10,1,1"
+varnish v1 -clierr 106 "param.set vbc_pool a,10,10"
+varnish v1 -clierr 106 "param.set vbc_pool 10,a,10"
+varnish v1 -clierr 106 "param.set vbc_pool 10,10,a"



From phk at varnish-cache.org  Wed Dec 14 10:52:23 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 14 Dec 2011 11:52:23 +0100
Subject: [master] a0ac5ac Merge branch 'master' of
	ssh://git.varnish-cache.org/git/varnish-cache
Message-ID: <E1RamRj-0001AH-26@project.varnish-software.com>

commit a0ac5ac55dafb1d70501ab0a05164e62c3eb716c
Merge: cf024ae 7f3b2a7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 14 10:52:14 2011 +0000

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache



From perbu at varnish-cache.org  Wed Dec 14 15:04:41 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Wed, 14 Dec 2011 16:04:41 +0100
Subject: [master] 89ad25e Some clarification on how 'now' works I'm not sure
	if we should go into more detail about how the whole thing works
Message-ID: <E1RaqNt-0000Fv-VI@project.varnish-software.com>

commit 89ad25ed13e8bbc3aca06a10acb4b1822ecf8e2a
Author: Per Buer <perbu at varnish-software.com>
Date:   Wed Dec 14 16:04:39 2011 +0100

    Some clarification on how 'now' works
    I'm not sure if we should go into more detail about how the whole thing works

diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index 5b2e6d0..2c185ed 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -679,7 +679,8 @@ made available to the handler subroutines through global variables.
 The following variables are always available:
 
 now   
-  The current time, in seconds since the epoch.
+  The current time, in seconds since the epoch. When used in string context
+  it returns a formatted string.
 
 The following variables are available in backend declarations:
 



From phk at varnish-cache.org  Thu Dec 15 08:35:14 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 09:35:14 +0100
Subject: [master] 65d9628 Count Trylocks that succeed
Message-ID: <E1Rb6mY-0003qc-U9@project.varnish-software.com>

commit 65d9628481ea72ae2fc939f34391bfc01f92c179
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 08:35:02 2011 +0000

    Count Trylocks that succeed

diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index 78b5e42..cff9845 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -118,6 +118,7 @@ Lck__Trylock(struct lock *lck, const char *p, const char *f, int l)
 	if (r == 0) {
 		AZ(ilck->held);
 		ilck->held = 1;
+		ilck->stat->locks++;
 		ilck->owner = pthread_self();
 	}
 	return (r);



From phk at varnish-cache.org  Thu Dec 15 09:00:58 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 10:00:58 +0100
Subject: [master] 9f5becc FlexeLinting
Message-ID: <E1Rb7BS-0006Cs-7T@project.varnish-software.com>

commit 9f5becc0c3d1a409d9e3ac753762cd6ce7149e25
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 09:00:49 2011 +0000

    FlexeLinting

diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index fedc0d1..6faf0c5 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -161,7 +161,7 @@ tweak_generic_double(struct cli *cli, const struct parspec *par,
 	if (arg != NULL) {
 		p = NULL;
 		u = strtod(arg, &p);
-		if (arg == '\0' || *p != '\0') {
+		if (*p != '\0') {
 			VCLI_Out(cli,
 			    "Not a number (%s)\n", arg);
 			VCLI_SetResult(cli, CLIS_PARAM);
@@ -241,12 +241,13 @@ tweak_generic_uint(struct cli *cli, volatile unsigned *dest, const char *arg,
 		p = NULL;
 		if (!strcasecmp(arg, "unlimited"))
 			u = UINT_MAX;
-		else
+		else {
 			u = strtoul(arg, &p, 0);
-		if (*arg == '\0' || *p != '\0') {
-			VCLI_Out(cli, "Not a number (%s)\n", arg);
-			VCLI_SetResult(cli, CLIS_PARAM);
-			return (-1);
+			if (*arg == '\0' || *p != '\0') {
+				VCLI_Out(cli, "Not a number (%s)\n", arg);
+				VCLI_SetResult(cli, CLIS_PARAM);
+				return (-1);
+			}
 		}
 		if (u < min) {
 			VCLI_Out(cli, "Must be at least %u\n", min);



From phk at varnish-cache.org  Thu Dec 15 09:32:25 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 10:32:25 +0100
Subject: [master] b83c68d Formailize some of the macro-crutches I use to
	explain stuff to FlexeLint.
Message-ID: <E1Rb7ft-0001WI-Dr@project.varnish-software.com>

commit b83c68dd51ed522aac12129ecf6e45adbc28ea4f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 09:21:45 2011 +0000

    Formailize some of the macro-crutches I use to explain stuff to FlexeLint.

diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 2ff5623..3509f25 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -42,6 +42,26 @@
 
 struct cli;
 
+/**********************************************************************
+ * FlexeLint and compiler shutuppery
+ */
+
+/*
+ * In OO-light situations, functions have to match their prototype
+ * even if that means not const'ing a const'able argument.
+ * The typedef should be specified as argument to the macro.
+ */
+#define __match_proto__(xxx)		/*lint -e{818} */
+
+/*
+ * State variables may change value before we use the last value we
+ * set them to.
+ * Pass no argument.
+ */
+#define __state_variable__(xxx)		/*lint -esym(838,xxx) */
+
+/**********************************************************************/
+
 /* Name of transient storage */
 #define TRANSIENT_STORAGE	"Transient"
 
@@ -52,8 +72,6 @@ extern pid_t mgt_pid;
 extern struct vsb *vident;		// XXX: -> heritage ?
 int Symbol_Lookup(struct vsb *vsb, void *ptr);
 
-/* Help shut up FlexeLint */
-#define __match_proto__(xxx) /*lint -e{818} */
 
 /* Really belongs in mgt.h, but storage_file chokes on both */
 void mgt_child_inherit(int fd, const char *what);



From phk at varnish-cache.org  Thu Dec 15 09:32:25 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 10:32:25 +0100
Subject: [master] e9b524b Add the mempool guard-thread
Message-ID: <E1Rb7ft-0001WZ-Fy@project.varnish-software.com>

commit e9b524b71aca73e048dd38ea8238f323e8be9558
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 09:32:09 2011 +0000

    Add the mempool guard-thread

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index edfe75f..9601270 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -855,9 +855,7 @@ int Lck_CondWait(pthread_cond_t *cond, struct lock *lck, struct timespec *ts);
 /* cache_mempool.c */
 struct mempool * MPL_New(const char *name, struct lock *mtx,
     volatile struct poolparam *pp, volatile unsigned *cur_size);
-void *MPL_GetLocked(struct mempool *mpl, unsigned *size);
 void *MPL_Get(struct mempool *mpl, unsigned *size);
-void MPL_FreeLocked(struct mempool *mpl, void *item);
 void MPL_Free(struct mempool *mpl, void *item);
 
 
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 6677c84..6f46a2a 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -35,6 +35,8 @@
 
 #include "cache.h"
 
+#include "vtim.h"
+
 struct memitem {
 	unsigned			magic;
 #define MEMITEM_MAGIC			0x42e55401
@@ -47,14 +49,114 @@ struct mempool {
 	unsigned			magic;
 #define MEMPOOL_MAGIC			0x37a75a8d
 	VTAILQ_HEAD(,memitem)		list;
+	VTAILQ_HEAD(,memitem)		surplus;
 	struct lock			*mtx;
 	struct lock			imtx;
 	const char			*name;
 	volatile struct poolparam	*param;
 	volatile unsigned		*cur_size;
 	struct VSC_C_mempool		*vsc;
+	unsigned			n_pool;
+	pthread_t			thread;
 };
 
+/*---------------------------------------------------------------------
+ */
+
+static struct memitem *
+mpl_alloc(const struct mempool *mpl)
+{
+	unsigned tsz;
+	struct memitem *mi;
+
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	tsz = *mpl->cur_size;
+	mi = calloc(sizeof *mi + tsz, 1);
+	AN(mi);
+	mi->magic = MEMITEM_MAGIC;
+	mi->size = tsz;
+	return (mi);
+}
+
+/*---------------------------------------------------------------------
+ * Pool-guard
+ *   Attempt to keep number of free items in pool inside bounds with
+ *   minimum locking activity.
+ */
+
+static void *
+mpl_guard(void *priv)
+{
+	struct mempool *mpl;
+	struct memitem *mi = NULL;
+	double mpl_slp __state_variable__(mpl_slp);
+
+	CAST_OBJ_NOTNULL(mpl, priv, MEMPOOL_MAGIC);
+	mpl_slp = 0.15;	// random
+	while (1) {
+		VTIM_sleep(mpl_slp);
+		mpl_slp = 0.814;	// random
+
+		if (mi != NULL && (mpl->n_pool > mpl->param->max_pool ||
+		    mi->size < *mpl->cur_size)) {
+			FREE_OBJ(mi);
+			mi = NULL;
+		}
+
+		if (mi == NULL && mpl->n_pool < mpl->param->min_pool)
+			mi = mpl_alloc(mpl);
+
+		if (mpl->n_pool < mpl->param->min_pool && mi != NULL) {
+			/* can do */
+		} else if (mpl->n_pool > mpl->param->max_pool && mi == NULL) {
+			/* can do */
+		} else if (!VTAILQ_EMPTY(&mpl->surplus)) {
+			/* can do */
+		} else {
+			continue;	/* cannot do */
+		}
+
+		mpl_slp = 0.314;
+
+		if (Lck_Trylock(mpl->mtx))
+			continue;
+
+		mpl_slp = .01;
+
+		if (mpl->n_pool < mpl->param->min_pool &&
+		    mi != NULL && mi->size >= *mpl->cur_size) {
+			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+			mpl->vsc->pool++;
+			mpl->n_pool++;
+			VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
+			mi = NULL;
+		}
+		if (mpl->n_pool > mpl->param->max_pool && mi == NULL) {
+			mi = VTAILQ_FIRST(&mpl->list);
+			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+			mpl->vsc->pool--;
+			mpl->n_pool--;
+			VTAILQ_REMOVE(&mpl->list, mi, list);
+		}
+		if (mi == NULL) {
+			mi = VTAILQ_FIRST(&mpl->surplus);
+			if (mi != NULL) {
+				CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+				VTAILQ_REMOVE(&mpl->surplus, mi, list);
+			}
+		}
+		Lck_Unlock(mpl->mtx);
+
+		if (mi != NULL) {
+			FREE_OBJ(mi);
+			mi = NULL;
+		}
+	}
+}
+
+/*---------------------------------------------------------------------
+ */
+
 struct mempool *
 MPL_New(const char *name,
 	struct lock *mtx,
@@ -70,6 +172,7 @@ MPL_New(const char *name,
 	mpl->cur_size = cur_size;
 	mpl->mtx = mtx;
 	VTAILQ_INIT(&mpl->list);
+	VTAILQ_INIT(&mpl->surplus);
 	Lck_New(&mpl->imtx, lck_mempool);
 	if (mpl->mtx == NULL)
 		mpl->mtx = &mpl->imtx;
@@ -77,88 +180,77 @@ MPL_New(const char *name,
 	mpl->vsc = VSM_Alloc(sizeof *mpl->vsc,
 	    VSC_CLASS, VSC_TYPE_MEMPOOL, name);
 	AN(mpl->vsc);
+	AZ(pthread_create(&mpl->thread, NULL, mpl_guard, mpl));
 	return (mpl);
 }
 
 void *
-MPL_GetLocked(struct mempool *mpl, unsigned *size)
+MPL_Get(struct mempool *mpl, unsigned *size)
 {
 	struct memitem *mi;
-	unsigned tsz;
 
 	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
-	Lck_AssertHeld(mpl->mtx);
+
+	Lck_Lock(mpl->mtx);
 
 	mpl->vsc->allocs++;
 	mpl->vsc->live++;
+
 	do {
 		mi = VTAILQ_FIRST(&mpl->list);
 		if (mi == NULL)
 			break;
 		mpl->vsc->pool--;
+		mpl->n_pool--;
 		CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 		VTAILQ_REMOVE(&mpl->list, mi, list);
 		if (mi->size < *mpl->cur_size) {
 			mpl->vsc->toosmall++;
-			FREE_OBJ(mi);
+			VTAILQ_INSERT_HEAD(&mpl->surplus, mi, list);
 			mi = NULL;
 		} else {
 			mpl->vsc->recycle++;
 		}
 	} while (mi == NULL);
-	if (mi == NULL) {
-		tsz = *mpl->cur_size;
-		mi = calloc(sizeof *mi + tsz, 1);
-		AN(mi);
-		mi->magic = MEMITEM_MAGIC;
-		mi->size = tsz;
-	}
+
+	Lck_Unlock(mpl->mtx);
+
+	if (mi == NULL)
+		mi = mpl_alloc(mpl);
 	if (size != NULL)
 		*size = mi->size;
-	return (&mi->payload);
+
+	/* Throw away sizeof info for FlexeLint: */
+	return ((void*)(uintptr_t)&mi->payload);
 }
 
 void
-MPL_FreeLocked(struct mempool *mpl, void *item)
+MPL_Free(struct mempool *mpl, void *item)
 {
 	struct memitem *mi;
 
 	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
-	Lck_AssertHeld(mpl->mtx);
-
-	mpl->vsc->frees++;
-	mpl->vsc->live--;
 
 	mi = (void*)((uintptr_t)item - offsetof(struct memitem, payload));
 	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+	memset(item, 0, mi->size);
+
+	Lck_Lock(mpl->mtx);
+
+	mpl->vsc->frees++;
+	mpl->vsc->live--;
 
 	if (mi->size < *mpl->cur_size) {
 		mpl->vsc->toosmall++;
-		FREE_OBJ(mi);
+		VTAILQ_INSERT_HEAD(&mpl->surplus, mi, list);
+	} else if (mpl->n_pool >= mpl->param->max_pool) {
+		mpl->vsc->surplus++;
+		VTAILQ_INSERT_HEAD(&mpl->surplus, mi, list);
 	} else {
 		mpl->vsc->pool++;
-		memset(item, 0, mi->size);
+		mpl->n_pool++;
 		VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
 	}
-}
-
-void *
-MPL_Get(struct mempool *mpl, unsigned *size)
-{
-	void *p;
-
-	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
-	Lck_Lock(mpl->mtx);
-	p = MPL_GetLocked(mpl, size);
-	Lck_Unlock(mpl->mtx);
-	return (p);
-}
 
-void
-MPL_Free(struct mempool *mpl, void *item)
-{
-	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
-	Lck_Lock(mpl->mtx);
-	MPL_FreeLocked(mpl, item);
 	Lck_Unlock(mpl->mtx);
 }
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 6faf0c5..1935344 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -632,7 +632,6 @@ tweak_poolparam(struct cli *cli, const struct parspec *par, const char *arg)
 			}
 			*pp = px;
 		} while(0);
-		
 	}
 }
 
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index cc72903..58f4d88 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -116,5 +116,6 @@ VSC_F(pool,			uint64_t, 0, 'g', "In Pool", "")
 VSC_F(recycle,			uint64_t, 0, 'g', "Recycled from pool", "")
 VSC_F(timeout,			uint64_t, 0, 'g', "Timed out from pool", "")
 VSC_F(toosmall,			uint64_t, 0, 'g', "Too small to recycle", "")
+VSC_F(surplus,			uint64_t, 0, 'g', "Too many for pool", "")
 
 #endif



From phk at varnish-cache.org  Thu Dec 15 10:24:05 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 11:24:05 +0100
Subject: [master] 9f4bb5a Gcc is silly...
Message-ID: <E1Rb8Tt-0002Sb-BG@project.varnish-software.com>

commit 9f4bb5a36442811cf823cb977511fc0964d62cef
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 10:23:56 2011 +0000

    Gcc is silly...

diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 6f46a2a..ac4abf2 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -152,6 +152,7 @@ mpl_guard(void *priv)
 			mi = NULL;
 		}
 	}
+	NEEDLESS_RETURN(NULL);
 }
 
 /*---------------------------------------------------------------------



From phk at varnish-cache.org  Thu Dec 15 21:55:05 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 15 Dec 2011 22:55:05 +0100
Subject: [master] 3e1787c Remove two old relics
Message-ID: <E1RbJGb-0007b3-MA@project.varnish-software.com>

commit 3e1787cdd2df94894dc695e1101002cf7d0db578
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 15 21:54:57 2011 +0000

    Remove two old relics

diff --git a/bin/varnishd/c.sh b/bin/varnishd/c.sh
deleted file mode 100644
index 8bab772..0000000
--- a/bin/varnishd/c.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# A client side script to test the ESI parsing, see s.sh for serverside
-
-set -e
-
-echo ""
-while true
-do
-	sleep 1
-	echo ""
-	fetch -o - -q http://localhost:8080/ | hexdump -C |
-		 sed 's/$//'
-	echo ""
-done
diff --git a/bin/varnishd/s.sh b/bin/varnishd/s.sh
deleted file mode 100644
index 469cfb5..0000000
--- a/bin/varnishd/s.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# A server side test-script for pushing the ESI XML parser over a
-# storage boundary.
-# The crucial trick here is that we send these objects HTTP/0.9 style
-# so that cache_fetch puts the first 128k in one storage object and
-# the rest in another, thus by putting around 128K space in our test
-# data we can put it right before, over and after the storage boundary.
-#
-# Use c.sh as the client side, and run varnish with this vcl:
-#
-# backend b1 {
-#         set backend.host = "Localhost";
-#         set backend.port = "8081";
-# }
-# 
-# sub vcl_recv {
-# 	pass;
-# }
-# 
-# sub vcl_fetch {
-# 	esi;
-# }
-
-serve () (
-	(
-	echo 'HTTP/1.0 200 OK'
-	echo ''
-	echo "$1"
-	dd if=/dev/zero bs=$2 count=1 2>/dev/null | tr '\0' ' ' 
-	cat
-	sleep .1
-	) | nc -l 8081
-)
-
-
-
-if false ; then
-    echo -n "<esi:remove> foo </esi:remove> bar" | serve Test01 1
-    echo -n "<esi:remove> foo </esi:remove> bar" | serve Test02 2
-    # Unterminated CDATA
-    echo -n "<esi:remove> foo </esi:remove> { <![CDATA[foo]] }" | serve Test03 10
-
-    for i in `jot 40 131020`
-    do
-	echo -n "<esi:remove> foo </esi:remove> bar" | serve Test04::$i $i
-    done
-
-    for i in `jot 40 131036`
-    do
-	echo -n "<!--esi foo --> bar" | serve Test05::$i $i
-    done
-
-    for i in `jot 22 131040`
-    do
-	echo -n "<![CDATA[foo]]>" | serve Test06::$i $i
-    done
-
-    echo -n "<esi:remove> " | serve Test07 10
-
-    echo -n "<!--esi " | serve Test08 10
-
-    for i in `jot 10 131042`
-    do
-	echo -n " > " | serve "Test09:$i <esi:remove" $i
-    done
-
-    (
-    echo -n "<esi:remove  "
-    dd if=/dev/zero bs=32768 count=1 2>/dev/null | tr '\0' ' ' 
-    echo -n ">"
-    ) | serve "Test10"  131030
-
-    echo -n " ]]> " | serve "Test11:131048 <![CDATA[  " 131048
-    echo -n " bar" | serve "Test12 foo <esi:comment comment=\"Humbug!\"/> " 1
-    echo -n " bar" | serve "Test13 foo <esi:foo> " 1
-fi
-
-while true
-do
-    echo -n " <esi:say "Hi Mom">" | serve "Test13 foo <esi:foo> " 1
-done



From phk at varnish-cache.org  Fri Dec 16 09:43:10 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 16 Dec 2011 10:43:10 +0100
Subject: [master] 28af712 Stylistic nitpickery while I wait for the
	construction noises to allow intelligent hacking again:
Message-ID: <E1RbUJq-0001oq-00@project.varnish-software.com>

commit 28af712ca43b363a8f6c0c813df67f8661dd2be9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 16 09:42:19 2011 +0000

    Stylistic nitpickery while I wait for the construction noises to
    allow intelligent hacking again:
    
    Wrap lines longer than 80 char and fix inconsistent copy&paste in
    copyright/disclaimer text.

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 4570e3c..bb5cc8e 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
@@ -224,7 +224,8 @@ pass(int sock)
 		if (fds[0].revents & POLLIN) {
 			/* Get rid of the prompt, kinda hackish */
 			u = write(1, "\r           \r", 13);
-			u = VCLI_ReadResult(fds[0].fd, &status, &answer, timeout);
+			u = VCLI_ReadResult(fds[0].fd, &status, &answer,
+			    timeout);
 			if (u) {
 				if (status == CLIS_COMMS)
 					RL_EXIT(0);
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 8c83121..661b053 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -123,7 +123,8 @@ VCA_Prep(struct sess *sp)
 	sp->addr = WS_Dup(sp->ws, addr);
 	sp->port = WS_Dup(sp->ws, port);
 	if (cache_param->log_local_addr) {
-		AZ(getsockname(sp->fd, (void*)&sp->mysockaddr, &sp->mysockaddrlen));
+		AZ(getsockname(sp->fd, (void*)&sp->mysockaddr,
+		    &sp->mysockaddrlen));
 		VTCP_name(&sp->mysockaddr, sp->mysockaddrlen,
 		    addr, sizeof addr, port, sizeof port);
 		WSP(sp, SLT_SessionOpen, "%s %s %s %s",
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index c1bc055..6cfcaf3 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -354,7 +354,8 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
 			return (vc);
 		}
 		VSC_C_main->backend_toolate++;
-		WSL(sp->wrk, SLT_BackendClose, vc->vsl_id, "%s", bp->display_name);
+		WSL(sp->wrk, SLT_BackendClose, vc->vsl_id, "%s",
+		   bp->display_name);
 
 		/* Checkpoint log to flush all info related to this connection
 		   before the OS reuses the FD */
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index a3ae5c2..ad71169 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -175,7 +175,8 @@ void VBE_DropRefVcl(struct backend *);
 void VBE_DropRefLocked(struct backend *b);
 
 /* cache_backend_poll.c */
-void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p, const char *hosthdr);
+void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
+    const char *hosthdr);
 void VBP_Remove(struct backend *b, struct vrt_backend_probe const *p);
 void VBP_Use(const struct backend *b, const struct vrt_backend_probe const *p);
 void VBP_Summary(struct cli *cli, const struct vbp_target *vt);
diff --git a/bin/varnishd/cache/cache_backend_poll.c b/bin/varnishd/cache/cache_backend_poll.c
index efd64cb..85ad69e 100644
--- a/bin/varnishd/cache/cache_backend_poll.c
+++ b/bin/varnishd/cache/cache_backend_poll.c
@@ -474,7 +474,8 @@ vbp_new_vcl(const struct vrt_backend_probe *p, const char *hosthdr)
  */
 
 void
-VBP_Insert(struct backend *b, const struct vrt_backend_probe *p, const char *hosthdr)
+VBP_Insert(struct backend *b, const struct vrt_backend_probe *p,
+    const char *hosthdr)
 {
 	struct vbp_target *vt;
 	struct vbp_vcl *vcl;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 8826ae2..aed15ee 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -237,7 +237,8 @@ cnt_prepresp(struct sess *sp)
 
 	sp->t_resp = W_TIM_real(wrk);
 	if (wrk->obj->objcore != NULL) {
-		if ((sp->t_resp - wrk->obj->last_lru) > cache_param->lru_timeout &&
+		if ((sp->t_resp - wrk->obj->last_lru) >
+		    cache_param->lru_timeout &&
 		    EXP_Touch(wrk->obj->objcore))
 			wrk->obj->last_lru = sp->t_resp;
 		wrk->obj->last_use = sp->t_resp;	/* XXX: locking ? */
@@ -1025,7 +1026,8 @@ cnt_first(struct sess *sp)
 	sp->ws_ses = WS_Snapshot(sp->ws);
 
 	/* Receive a HTTP protocol request */
-	HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id, cache_param->http_req_size,
+	HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id,
+	    cache_param->http_req_size,
 	    cache_param->http_req_hdr_len);
 	wrk->acct_tmp.sess++;
 
@@ -1758,7 +1760,8 @@ static struct cli_proto debug_cmds[] = {
 	{ "debug.xid", "debug.xid",
 		"\tExamine or set XID\n", 0, 1, "d", cli_debug_xid },
 	{ "debug.srandom", "debug.srandom",
-		"\tSeed the random(3) function\n", 0, 1, "d", cli_debug_srandom },
+		"\tSeed the random(3) function\n", 0, 1, "d",
+		cli_debug_srandom },
 	{ NULL }
 };
 
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 0d6b74c..e961819 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -313,7 +313,8 @@ ESI_Deliver(struct sess *sp)
 					 * We have a gzip'ed VEC and delivers
 					 * a gzip'ed ESI response.
 					 */
-					(void)WRW_Write(sp->wrk, st->ptr + off, l2);
+					(void)WRW_Write(sp->wrk,
+					    st->ptr + off, l2);
 				} else if (sp->wrk->gzip_resp) {
 					/*
 					 * A gzip'ed ESI response, but the VEC
@@ -339,7 +340,8 @@ ESI_Deliver(struct sess *sp)
 					/*
 					 * Ungzip'ed VEC, ungzip'ed ESI response
 					 */
-					(void)WRW_Write(sp->wrk, st->ptr + off, l2);
+					(void)WRW_Write(sp->wrk,
+					    st->ptr + off, l2);
 				}
 				off += l2;
 				if (off == st->len) {
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index a3cb805..afa069a 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -385,9 +385,9 @@ pool_breed(struct pool *qp, const pthread_attr_t *tp_attr)
 	 * If we need more threads, and have space, create
 	 * one more thread.
 	 */
-	if (qp->nthr < cache_param->wthread_min ||	/* Not enough threads yet */
-	    (qp->lqueue > cache_param->wthread_add_threshold && /* more needed */
-	    qp->lqueue > qp->last_lqueue)) {	/* not getting better since last */
+	if (qp->nthr < cache_param->wthread_min || /* Not enough threads yet */
+	    (qp->lqueue > cache_param->wthread_add_threshold && /* need more  */
+	    qp->lqueue > qp->last_lqueue)) { /* not getting better since last */
 		if (qp->nthr > cache_param->wthread_max) {
 			Lck_Lock(&pool_mtx);
 			VSC_C_main->threads_limited++;
@@ -481,7 +481,8 @@ pool_herder(void *priv)
 		pp->nqueued = pp->ndropped = 0;
 		w = VTAILQ_LAST(&pp->idle, workerhead);
 		if (w != NULL &&
-		    (w->lastused < t_idle || pp->nthr > cache_param->wthread_max)) {
+		    (w->lastused < t_idle ||
+		    pp->nthr > cache_param->wthread_max)) {
 			VTAILQ_REMOVE(&pp->idle, w, list);
 		} else
 			w = NULL;
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 7c63d51..43feae9 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -113,8 +113,8 @@ RES_BuildHttp(const struct sess *sp)
 	http_ClrHeader(sp->wrk->resp);
 	sp->wrk->resp->logtag = HTTP_Tx;
 	http_CopyResp(sp->wrk->resp, sp->wrk->obj->http);
-	http_FilterFields(sp->wrk, sp->vsl_id, sp->wrk->resp, sp->wrk->obj->http,
-	    HTTPH_A_DELIVER);
+	http_FilterFields(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	    sp->wrk->obj->http, HTTPH_A_DELIVER);
 
 	if (!(sp->wrk->res_mode & RES_LEN)) {
 		http_Unset(sp->wrk->resp, H_Content_Length);
@@ -129,7 +129,8 @@ RES_BuildHttp(const struct sess *sp)
 		    "Transfer-Encoding: chunked");
 
 	VTIM_format(VTIM_real(), time_str);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Date: %s", time_str);
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	    "Date: %s", time_str);
 
 	if (sp->xid != sp->wrk->obj->xid)
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 0662e26..54124b2 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -88,12 +88,12 @@ VRT_DO_HDR(req,   proto,	sp->http,		HTTP_HDR_PROTO)
 VRT_DO_HDR(bereq, request,	sp->wrk->busyobj->bereq,	HTTP_HDR_REQ)
 VRT_DO_HDR(bereq, url,		sp->wrk->busyobj->bereq,	HTTP_HDR_URL)
 VRT_DO_HDR(bereq, proto,	sp->wrk->busyobj->bereq,	HTTP_HDR_PROTO)
-VRT_DO_HDR(obj,   proto,	sp->wrk->obj->http,		HTTP_HDR_PROTO)
-VRT_DO_HDR(obj,   response,	sp->wrk->obj->http,		HTTP_HDR_RESPONSE)
+VRT_DO_HDR(obj,   proto,	sp->wrk->obj->http,	HTTP_HDR_PROTO)
+VRT_DO_HDR(obj,   response,	sp->wrk->obj->http,	HTTP_HDR_RESPONSE)
 VRT_DO_HDR(resp,  proto,	sp->wrk->resp,		HTTP_HDR_PROTO)
 VRT_DO_HDR(resp,  response,	sp->wrk->resp,		HTTP_HDR_RESPONSE)
 VRT_DO_HDR(beresp,  proto,	sp->wrk->busyobj->beresp,	HTTP_HDR_PROTO)
-VRT_DO_HDR(beresp,  response,	sp->wrk->busyobj->beresp,	HTTP_HDR_RESPONSE)
+VRT_DO_HDR(beresp,  response,	sp->wrk->busyobj->beresp, HTTP_HDR_RESPONSE)
 
 /*--------------------------------------------------------------------*/
 
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 01937b3..b5f48d3 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
diff --git a/bin/varnishd/default.vcl b/bin/varnishd/default.vcl
index 412b6e9..dc4f555 100644
--- a/bin/varnishd/default.vcl
+++ b/bin/varnishd/default.vcl
@@ -16,15 +16,17 @@
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+
  *
  * The default VCL code.
  *
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 0b3a7b1..9935fc2 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -191,7 +191,8 @@ hcb_crit_bit(const struct objhead *oh1, const struct objhead *oh2,
  */
 
 static struct objhead *
-hcb_insert(struct worker *wrk, struct hcb_root *root, struct objhead *oh, int has_lock)
+hcb_insert(struct worker *wrk, struct hcb_root *root, struct objhead *oh,
+    int has_lock)
 {
 	volatile uintptr_t *p;
 	uintptr_t pp;
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 52463e6..0e3eb9e 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -48,7 +48,8 @@ void MGT_Child_Cli_Fail(void);
 /* mgt_cli.c */
 
 typedef void mgt_cli_close_f(void *priv);
-void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f *close_func, void *priv);
+void mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident,
+    mgt_cli_close_f *close_func, void *priv);
 int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...);
 void mgt_cli_start_child(int fdi, int fdo);
 void mgt_cli_stop_child(void);
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index b141f5b..cbea81f 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -374,7 +374,8 @@ mgt_cli_callback2(const struct vev *e, int what)
 /*--------------------------------------------------------------------*/
 
 void
-mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f *closefunc, void *priv)
+mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident,
+    mgt_cli_close_f *closefunc, void *priv)
 {
 	struct cli *cli;
 	struct vev *ev;
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 1935344..128364c 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -797,7 +797,8 @@ static const struct parspec input_parspec[] = {
 		"See setsockopt(2) under SO_SNDTIMEO for more information.",
 		DELAYED_EFFECT,
 		"600", "seconds" },
-	{ "idle_send_timeout", tweak_timeout, &mgt_param.idle_send_timeout, 0, 0,
+	{ "idle_send_timeout", tweak_timeout, &mgt_param.idle_send_timeout,
+		0, 0,
 		"Time to wait with no data sent. "
 		"If no data has been transmitted in this many\n"
                 "seconds the session is closed. \n"
@@ -1409,7 +1410,8 @@ MCF_DumpRst(void)
 	const char *p, *q;
 	int i;
 
-	printf("\n.. The following is the autogenerated output from varnishd -x dumprst\n\n");
+	printf("\n.. The following is the autogenerated "
+	    "output from varnishd -x dumprst\n\n");
 	for (i = 0; i < nparspec; i++) {
 		pp = parspec[i];
 		printf("%s\n", pp->name);
diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index e6320fd..d34eef2 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -135,7 +135,8 @@ const struct parspec WRK_parspec[] = {
 		"Minimum is 2 threads.",
 		EXPERIMENTAL | DELAYED_EFFECT,
 		"5", "threads" },
-	{ "thread_pool_timeout", tweak_timeout, &mgt_param.wthread_timeout, 1, 0,
+	{ "thread_pool_timeout", tweak_timeout, &mgt_param.wthread_timeout,
+		1, 0,
 		"Thread idle threshold.\n"
 		"\n"
 		"Threads in excess of thread_pool_min, which have been idle "
diff --git a/bin/varnishd/mgt/mgt_sandbox_solaris.c b/bin/varnishd/mgt/mgt_sandbox_solaris.c
index 114d6a4..e043fef 100644
--- a/bin/varnishd/mgt/mgt_sandbox_solaris.c
+++ b/bin/varnishd/mgt/mgt_sandbox_solaris.c
@@ -137,7 +137,8 @@ mgt_sandbox_solaris_init(void)
 
 	if (! (priv_all = priv_allocset())) {
 		REPORT(LOG_ERR,
-		    "Child start warning: mgt_sandbox_init - priv_allocset failed: errno=%d (%s)",
+		    "Child start warning: "
+		    " mgt_sandbox_init - priv_allocset failed: errno=%d (%s)",
 		    errno, strerror(errno));
 		return;
 	}
@@ -164,7 +165,8 @@ mgt_sandbox_solaris_privsep(void)
                 if (getuid() != mgt_param.uid)
                         XXXAZ(setuid(mgt_param.uid));
         } else {
-                REPORT(LOG_INFO, "Privilege %s missing, will not change uid/gid",
+                REPORT(LOG_INFO,
+		    "Privilege %s missing, will not change uid/gid",
 		    PRIV_PROC_SETID);
         }
 }
@@ -194,7 +196,8 @@ mgt_sandbox_solaris_fini(void)
 	    !(inheritable = priv_allocset()) ||
 	    !(permitted = priv_allocset())) {
 		REPORT(LOG_ERR,
-		    "Child start warning: mgt_sandbox_waive - priv_allocset failed: errno=%d (%s)",
+		    "Child start warning: "
+		    " mgt_sandbox_waive - priv_allocset failed: errno=%d (%s)",
 		    errno, strerror(errno));
 		return;
 	}
@@ -218,7 +221,8 @@ mgt_sandbox_solaris_fini(void)
 #define SETPPRIV(which, set)						\
 	if (setppriv(PRIV_OFF, which, set))				\
 		REPORT(LOG_ERR,						\
-		    "Child start warning: Waiving privileges failed on %s: errno=%d (%s)", \
+		    "Child start warning: "				\
+		    " Waiving privileges failed on %s: errno=%d (%s)",	\
 		    #which, errno, strerror(errno));
 
 	SETPPRIV(PRIV_LIMIT, permitted);
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 23df3de..7ceb80c 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -131,7 +131,8 @@ vwk_kev(struct vwk *vwk, const struct kevent *kp)
 		SES_Delete(sp, "EOF");
 		return;
 	} else {
-		VSL(SLT_Debug, sp->vsl_id, "KQ: sp %p kev data %lu flags 0x%x%s",
+		VSL(SLT_Debug, sp->vsl_id,
+		    "KQ: sp %p kev data %lu flags 0x%x%s",
 		    sp, (unsigned long)kp->data, kp->flags,
 		    (kp->flags & EV_EOF) ? " EOF" : "");
 	}
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 17d7ce0..ce2afc3 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -15,7 +15,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
@@ -108,7 +108,8 @@ vws_port_ev(struct vws *vws, port_event_t *ev) {
 		 * port_dissociate after port_getn(), but in fact,
 		 * port_dissociate should be used
 		 *
-		 * Ref: http://opensolaris.org/jive/thread.jspa?threadID=129476&tstart=0
+		 * Ref: http://opensolaris.org/jive/thread.jspa?\
+		 *          threadID=129476&tstart=0
 		 */
 		vws_del(vws, sp->fd);
 		VTAILQ_REMOVE(&vws->sesshead, sp, list);
@@ -145,7 +146,7 @@ vws_thread(void *priv)
 	 * - additional tolerance for handling session timeouts
 	 *
 	 */
-	static struct timespec min_ts = {0L,    100L /*ms*/  * 1000L /*us*/  * 1000L /*ns*/};
+	static struct timespec min_ts = {0L, 100L * 1000L * 1000L /*ns*/};
 	static double          min_t  = 0.1; /* 100    ms*/
 	static struct timespec max_ts = {1L, 0L};		/* 1 second */
 	static double	       max_t  = 1.0;			/* 1 second */
@@ -177,7 +178,8 @@ vws_thread(void *priv)
 		/*
 		 * see disucssion in
 		 * - https://issues.apache.org/bugzilla/show_bug.cgi?id=47645
-		 * - http://mail.opensolaris.org/pipermail/networking-discuss/2009-August/011979.html
+		 * - http://mail.opensolaris.org/pipermail/\
+		 *       networking-discuss/2009-August/011979.html
 		 *
 		 * comment from apr/poll/unix/port.c :
 		 *
@@ -224,9 +226,13 @@ vws_thread(void *priv)
 		 */
 
 		if (sp) {
-			double tmo = (sp->t_open + cache_param->sess_timeout) - now;
+			double tmo =
+			    (sp->t_open + cache_param->sess_timeout) - now;
 
-			/* we should have removed all sps whose timeout has passed */
+			/*
+			 * we should have removed all sps whose timeout
+			 * has passed
+			 */
 			assert(tmo > 0.0);
 
 			if (tmo < min_t) {
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 852ff41..03bfd88 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -106,9 +106,21 @@ struct profile {
 	int hist_low;
 	int hist_high;
 } profiles[] = {
-	{ .name = "responsetime", .tag = SLT_ReqEnd, .field = 5, .hist_low = -6, .hist_high = 3 },
-	{ .name = "size", .tag = SLT_Length, .field = 1, .hist_low = 1, .hist_high = 8 },
-	{ 0 }
+	{
+		.name = "responsetime",
+		.tag = SLT_ReqEnd,
+		.field = 5,
+		.hist_low = -6,
+		.hist_high = 3
+	}, {
+		.name = "size",
+		.tag = SLT_Length,
+		.field = 1,
+		.hist_low = 1,
+		.hist_high = 8
+	}, {
+		.name = 0,
+	}
 };
 
 static struct profile *active_profile;
@@ -335,7 +347,8 @@ static void
 usage(void)
 {
 	fprintf(stderr, "usage: varnishhist "
-	    "%s [-p profile] [-f field_num] [-R max] [-r min] [-V] [-w delay]\n", VSL_USAGE);
+	    "%s [-p profile] [-f field_num] "
+	    "[-R max] [-r min] [-V] [-w delay]\n", VSL_USAGE);
 	exit(1);
 }
 
@@ -386,7 +399,8 @@ main(int argc, char **argv)
 		}
 	}
 	if (profile) {
-		for (active_profile = profiles; active_profile->name; active_profile++) {
+		for (active_profile = profiles; active_profile->name;
+		    active_profile++) {
 			if (strcmp(active_profile->name, profile) == 0) {
 				break;
 			}
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 45b4327..a606861 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -270,7 +270,8 @@ static void
 usage(void)
 {
 	fprintf(stderr, "usage: varnishlog "
-	    "%s [-aDV] [-o [tag regex]] [-n varnish_name] [-P file] [-w file]\n", VSL_USAGE);
+	    "%s [-aDV] [-o [tag regex]] [-n varnish_name]"
+	    " [-P file] [-w file]\n", VSL_USAGE);
 	exit(1);
 }
 
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 5561adc..9da6172 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -102,7 +102,8 @@ static struct logline {
 	char *df_u;			/* %u, Remote user */
 	char *df_ttfb;			/* Time to first byte */
 	const char *df_hitmiss;		/* Whether this is a hit or miss */
-	const char *df_handling;	/* How the request was handled (hit/miss/pass/pipe) */
+	const char *df_handling;	/* How the request was handled
+					   (hit/miss/pass/pipe) */
 	int active;			/* Is log line in an active trans */
 	int complete;			/* Is log line complete */
 	uint64_t bitmap;		/* Bitmap for regex matches */
@@ -549,7 +550,9 @@ collect_client(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
 		char ttfb[64];
 		if (!lp->active)
 			break;
-		if (lp->df_ttfb != NULL || sscanf(ptr, "%*u %*u.%*u %ld.%*u %*u.%*u %s", &l, ttfb) != 2) {
+		if (lp->df_ttfb != NULL ||
+		    sscanf(ptr, "%*u %*u.%*u %ld.%*u %*u.%*u %s", &l, ttfb)
+		    != 2) {
 			clean_logline(lp);
 			break;
 		}
@@ -679,7 +682,8 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
 			VSB_cat(os, lp->df_m ? lp->df_m : "-");
 			VSB_putc(os, ' ');
 			if (req_header(lp, "Host")) {
-				if (strncmp(req_header(lp, "Host"), "http://", 7) != 0)
+				if (strncmp(req_header(lp, "Host"),
+				    "http://", 7) != 0)
 					VSB_cat(os, "http://");
 				VSB_cat(os, req_header(lp, "Host"));
 			} else {
@@ -698,7 +702,8 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
 
 		case 't':
 			/* %t */
-			strftime(tbuf, sizeof tbuf, "[%d/%b/%Y:%T %z]", &lp->df_t);
+			strftime(tbuf, sizeof tbuf,
+			    "[%d/%b/%Y:%T %z]", &lp->df_t);
 			VSB_cat(os, tbuf);
 			break;
 
@@ -753,20 +758,23 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
 				p = tmp;
 				break;
 			case 'x':
-				if (strcmp(fname, "Varnish:time_firstbyte") == 0) {
+				if (!strcmp(fname, "Varnish:time_firstbyte")) {
 					VSB_cat(os, lp->df_ttfb);
 					p = tmp;
 					break;
-				} else if (strcmp(fname, "Varnish:hitmiss") == 0) {
-					VSB_cat(os, (lp->df_hitmiss ? lp->df_hitmiss : "-"));
+				} else if (!strcmp(fname, "Varnish:hitmiss")) {
+					VSB_cat(os, (lp->df_hitmiss ?
+					    lp->df_hitmiss : "-"));
 					p = tmp;
 					break;
-				} else if (strcmp(fname, "Varnish:handling") == 0) {
-					VSB_cat(os, (lp->df_handling ? lp->df_handling : "-"));
+				} else if (!strcmp(fname, "Varnish:handling")) {
+					VSB_cat(os, (lp->df_handling ?
+					    lp->df_handling : "-"));
 					p = tmp;
 					break;
-				} else if (strncmp(fname, "VCL_Log:", 8) == 0) {
-					// support pulling entries logged with std.log() into output.
+				} else if (!strncmp(fname, "VCL_Log:", 8)) {
+					// support pulling entries logged
+					// with std.log() into output.
 					// Format: %{VCL_Log:keyname}x
 					// Logging: std.log("keyname:value")
 					h = vcl_log(lp, fname+8);
@@ -775,7 +783,8 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
 					break;
 				}
 			default:
-				fprintf(stderr, "Unknown format starting at: %s\n", --p);
+				fprintf(stderr,
+				    "Unknown format starting at: %s\n", --p);
 				exit(1);
 			}
 			break;
@@ -783,7 +792,8 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
 			/* Fall through if we haven't handled something */
 			/* FALLTHROUGH*/
 		default:
-			fprintf(stderr, "Unknown format starting at: %s\n", --p);
+			fprintf(stderr,
+			    "Unknown format starting at: %s\n", --p);
 			exit(1);
 		}
 	}
@@ -854,15 +864,18 @@ main(int argc, char *argv[])
 			break;
 		case 'f':
 			if (format_flag) {
-				fprintf(stderr, "-f and -F can not be combined\n");
+				fprintf(stderr,
+				    "-f and -F can not be combined\n");
 				exit(1);
 			}
-			format = "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"";
+			format = "%{X-Forwarded-For}i %l %u %t \"%r\""
+			    " %s %b \"%{Referer}i\" \"%{User-agent}i\"";
 			format_flag = 1;
 			break;
 		case 'F':
 			if (format_flag) {
-				fprintf(stderr, "-f and -F can not be combined\n");
+				fprintf(stderr,
+				    "-f and -F can not be combined\n");
 				exit(1);
 			}
 			format_flag = 1;
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 5d9226f..859c379 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -241,7 +241,9 @@ usage(void)
 	    "The varnishd instance to get logs from");
 	fprintf(stderr, FMT, "-V", "Display the version number and exit");
 	fprintf(stderr, FMT, "-w delay",
-	    "Wait delay seconds between updates.  Default is 1 second. Can also be be used with -1, -x or -j for repeated output.");
+	    "Wait delay seconds between updates."
+	    "  Default is 1 second."
+	    " Can also be be used with -1, -x or -j for repeated output.");
 	fprintf(stderr, FMT, "-x",
 	    "Print statistics to stdout as XML.");
 	fprintf(stderr, FMT, "-j",
diff --git a/bin/varnishstat/varnishstat.h b/bin/varnishstat/varnishstat.h
index 0a5d80f..c229ed2 100644
--- a/bin/varnishstat/varnishstat.h
+++ b/bin/varnishstat/varnishstat.h
@@ -36,4 +36,5 @@
 #include "vcs.h"
 
 
-void do_curses(struct VSM_data *vd, const struct VSC_C_main *VSC_C_main, int delay);
+void do_curses(struct VSM_data *vd, const struct VSC_C_main *VSC_C_main,
+    int delay);
diff --git a/bin/varnishstat/varnishstat.xsd b/bin/varnishstat/varnishstat.xsd
index 84b0a6a..e9c5f3c 100644
--- a/bin/varnishstat/varnishstat.xsd
+++ b/bin/varnishstat/varnishstat.xsd
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:element name="varnishstat">
-		<xs:complexType>
+    <xs:element name="varnishstat">
+	<xs:complexType>
+	    <xs:sequence>
+		<xs:element name="stat" maxOccurs="unbounded">
+		    <xs:complexType>
 			<xs:sequence>
-				<xs:element name="stat" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="name" type="xs:string"/>
-							<xs:element name="value" type="xs:integer"/>
-							<xs:element name="description" type="xs:string"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
+			    <xs:element name="name" type="xs:string"/>
+			    <xs:element name="value" type="xs:integer"/>
+			    <xs:element name="description" type="xs:string"/>
 			</xs:sequence>
-			<xs:attribute name="timestamp" type="xs:dateTime"/>
-		</xs:complexType>
-	</xs:element>
+		    </xs:complexType>
+		</xs:element>
+	    </xs:sequence>
+	    <xs:attribute name="timestamp" type="xs:dateTime"/>
+	</xs:complexType>
+    </xs:element>
 </xs:schema>
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index d4e714c..3a672e1 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -174,7 +174,8 @@ do_curses(struct VSM_data *vd, const struct VSC_C_main *VSC_C_main,
 			 * Break to outher loop if we need to re-read file.
 			 * Only check if it looks like nothing is happening.
 			 */
-			act = VSC_C_main->cache_hit + VSC_C_main->cache_miss + 1;
+			act = VSC_C_main->cache_hit +
+			    VSC_C_main->cache_miss + 1;
 			lact = act;
 
 			AZ(gettimeofday(&tv, NULL));
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 890a98b..402b49f 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -229,7 +229,8 @@ vtc_dump(struct vtclog *vl, int lvl, const char *pfx, const char *str, int len)
 
 //lint -e{818}
 void
-vtc_hexdump(struct vtclog *vl, int lvl, const char *pfx, const unsigned char *str, int len)
+vtc_hexdump(struct vtclog *vl, int lvl, const char *pfx,
+    const unsigned char *str, int len)
 {
 	int nl = 1;
 	unsigned l;
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 62efb15..716b35b 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -327,7 +327,8 @@ main(int argc, char **argv)
 			errno = 0;
 			period = strtol(optarg, NULL, 0);
 			if (errno != 0)  {
-				fprintf(stderr, "Syntax error, %s is not a number", optarg);
+				fprintf(stderr,
+				    "Syntax error, %s is not a number", optarg);
 				exit(1);
 			}
 			break;
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index c8c4ecb..d63b187 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -20,7 +20,7 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION, "")
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
@@ -136,7 +136,8 @@ VSC_F(fetch_chunked,		uint64_t, 1, 'a', "Fetch chunked", "")
 VSC_F(fetch_eof,		uint64_t, 1, 'a', "Fetch EOF", "")
 VSC_F(fetch_bad,		uint64_t, 1, 'a', "Fetch had bad headers", "")
 VSC_F(fetch_close,		uint64_t, 1, 'a', "Fetch wanted close", "")
-VSC_F(fetch_oldhttp,		uint64_t, 1, 'a', "Fetch pre HTTP/1.1 closed", "")
+VSC_F(fetch_oldhttp,		uint64_t, 1, 'a',
+    "Fetch pre HTTP/1.1 closed", "")
 VSC_F(fetch_zero,		uint64_t, 1, 'a', "Fetch zero len", "")
 VSC_F(fetch_failed,		uint64_t, 1, 'a', "Fetch failed", "")
 VSC_F(fetch_1xx,		uint64_t, 1, 'a', "Fetch no body (1xx)", "")
@@ -293,9 +294,11 @@ VSC_F(sess_herd,		uint64_t, 1, 'a', "Session herd", "")
 
 VSC_F(shm_records,		uint64_t, 0, 'a', "SHM records", "")
 VSC_F(shm_writes,		uint64_t, 0, 'a', "SHM writes", "")
-VSC_F(shm_flushes,		uint64_t, 0, 'a', "SHM flushes due to overflow", "")
+VSC_F(shm_flushes,		uint64_t, 0, 'a',
+    "SHM flushes due to overflow", "")
 VSC_F(shm_cont,		uint64_t, 0, 'a', "SHM MTX contention", "")
-VSC_F(shm_cycles,		uint64_t, 0, 'a', "SHM cycles through buffer", "")
+VSC_F(shm_cycles,		uint64_t, 0, 'a',
+    "SHM cycles through buffer", "")
 
 VSC_F(sms_nreq,		uint64_t, 0, 'a', "SMS allocator requests", "")
 VSC_F(sms_nobj,		uint64_t, 0, 'i', "SMS outstanding allocations", "")
@@ -353,19 +356,24 @@ VSC_F(bans_dups,		uint64_t, 0, 'c',
 
 /**********************************************************************/
 
-VSC_F(hcb_nolock,		uint64_t, 0, 'a', "HCB Lookups without lock", "")
+VSC_F(hcb_nolock,		uint64_t, 0, 'a',
+    "HCB Lookups without lock", "")
 VSC_F(hcb_lock,		uint64_t, 0, 'a', "HCB Lookups with lock", "")
 VSC_F(hcb_insert,		uint64_t, 0, 'a', "HCB Inserts", "")
 
-VSC_F(esi_errors,		uint64_t, 0, 'a', "ESI parse errors (unlock)", "")
-VSC_F(esi_warnings,		uint64_t, 0, 'a', "ESI parse warnings (unlock)", "")
+VSC_F(esi_errors,		uint64_t, 0, 'a',
+    "ESI parse errors (unlock)", "")
+VSC_F(esi_warnings,		uint64_t, 0, 'a',
+    "ESI parse warnings (unlock)", "")
 VSC_F(client_drop_late,	uint64_t, 0, 'a', "Connection dropped late", "")
 VSC_F(uptime,		uint64_t, 0, 'a', "Client uptime", "")
 
 VSC_F(dir_dns_lookups,	uint64_t, 0, 'a', "DNS director lookups", "")
 VSC_F(dir_dns_failed,	uint64_t, 0, 'a', "DNS director failed lookups", "")
-VSC_F(dir_dns_hit,		uint64_t, 0, 'a', "DNS director cached lookups hit", "")
-VSC_F(dir_dns_cache_full,	uint64_t, 0, 'a', "DNS director full dnscache", "")
+VSC_F(dir_dns_hit,		uint64_t, 0, 'a',
+    "DNS director cached lookups hit", "")
+VSC_F(dir_dns_cache_full,	uint64_t, 0, 'a',
+    "DNS director full dnscache", "")
 
 VSC_F(vmods,		uint64_t, 0, 'i', "Loaded VMODs", "")
 
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 58f4d88..2671558 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -20,7 +20,7 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION, "")
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
diff --git a/include/vlu.h b/include/vlu.h
index e69c6ae..a9fe074 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -11,7 +11,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
diff --git a/include/vtcp.h b/include/vtcp.h
index 6ad260e..77f86ed 100644
--- a/include/vtcp.h
+++ b/include/vtcp.h
@@ -54,8 +54,10 @@ VTCP_Check(int a)
 
 #define VTCP_Assert(a) assert(VTCP_Check(a))
 
-void VTCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
-void VTCP_hisname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
+void VTCP_myname(int sock, char *abuf, unsigned alen,
+    char *pbuf, unsigned plen);
+void VTCP_hisname(int sock, char *abuf, unsigned alen,
+    char *pbuf, unsigned plen);
 int VTCP_filter_http(int sock);
 int VTCP_blocking(int sock);
 int VTCP_nonblocking(int sock);
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index f0e1635..c82e972 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -13,10 +13,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
diff --git a/lib/libvarnish/vfil.c b/lib/libvarnish/vfil.c
index ca1d965..6bcbde5 100644
--- a/lib/libvarnish/vfil.c
+++ b/lib/libvarnish/vfil.c
@@ -110,7 +110,8 @@ VFIL_readfile(const char *pfx, const char *fn, ssize_t *sz)
 	if (fn[0] == '/')
 		fd = open(fn, O_RDONLY);
 	else if (pfx != NULL) {
-		bprintf(fnb, "/%s/%s", pfx, fn); /* XXX: graceful length check */
+		bprintf(fnb, "/%s/%s", pfx, fn);
+		    /* XXX: graceful length check */
 		fd = open(fnb, O_RDONLY);
 	} else
 		fd = open(fn, O_RDONLY);
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index f149a57..610ca8b 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index d15f516..e361738 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -199,7 +199,8 @@ VTCP_nonblocking(int sock)
  */
 
 int
-VTCP_connect(int s, const struct sockaddr_storage *name, socklen_t namelen, int msec)
+VTCP_connect(int s, const struct sockaddr_storage *name, socklen_t namelen,
+    int msec)
 {
 	int i, k;
 	socklen_t l;
@@ -271,7 +272,8 @@ VTCP_set_read_timeout(int s, double seconds)
 	 * timeout does not get set. Needs to be fixed in Solaris, there is
 	 * nothing we can do about this.
 	 */
-	VTCP_Assert(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout));
+	VTCP_Assert(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
+	    &timeout, sizeof timeout));
 #else
 	(void)s;
 #endif
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index b399c98..accef82 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -379,9 +379,8 @@ VSC_Iter(struct VSM_data *vd, VSC_iter_f *func, void *priv)
 			VSM_Close(vd);
 			if (!vd->head && VSM_Open(vd))
 				return (-1);
-			if (!VSM_Get(vd, &vsc->iter_fantom, VSC_CLASS, "", "")) {
+			if (!VSM_Get(vd, &vsc->iter_fantom, VSC_CLASS, "", ""))
 				return (-1);
-			}
 		}
 		AN(vd->head);
 		/* Tell app that list will be nuked */
diff --git a/lib/libvcl/Makefile.am b/lib/libvcl/Makefile.am
index 44e2957..f135e43 100644
--- a/lib/libvcl/Makefile.am
+++ b/lib/libvcl/Makefile.am
@@ -33,8 +33,9 @@ libvcl_la_SOURCES = \
 EXTRA_DIST = \
 	generate.py
 
-vcc_obj.c vcc_fixed_token.c vcc_token_defs.h: $(srcdir)/generate.py $(top_srcdir)/include/vrt.h
-	@PYTHON@ $(top_srcdir)/lib/libvcl/generate.py $(top_srcdir) $(top_builddir)
+vcc_obj.c vcc_fixed_token.c vcc_token_defs.h: \
+	$(srcdir)/generate.py $(top_srcdir)/include/vrt.h
+	@PYTHON@ $(srcdir)/generate.py $(srcdir) $(top_builddir)
 
 CLEANFILES = $(builddir)/vcc_token_defs.h \
 	$(builddir)/vcc_fixed_token.c \
diff --git a/lib/libvcl/vcc_compile.h b/lib/libvcl/vcc_compile.h
index b67e4ca..caacd73 100644
--- a/lib/libvcl/vcc_compile.h
+++ b/lib/libvcl/vcc_compile.h
@@ -103,7 +103,8 @@ enum symkind {
 #undef VCC_SYMB
 };
 
-typedef void sym_expr_t(struct vcc *tl, struct expr **, const struct symbol *sym);
+typedef void sym_expr_t(struct vcc *tl, struct expr **,
+    const struct symbol *sym);
 typedef struct symbol *sym_wildcard_t(struct vcc *tl, const struct token *t,
     const struct symbol *sym);
 
@@ -234,7 +235,8 @@ void vcc_ResetFldSpec(struct fld_spec *f);
 void vcc_IsField(struct vcc *tl, struct token **t, struct fld_spec *fs);
 void vcc_FieldsOk(struct vcc *tl, const struct fld_spec *fs);
 
-void Emit_Sockaddr(struct vcc *tl, const struct token *t_host, const char *port);
+void Emit_Sockaddr(struct vcc *tl, const struct token *t_host,
+    const char *port);
 
 /* vcc_compile.c */
 extern struct method method_tab[];
@@ -292,7 +294,8 @@ char *vcc_regexp(struct vcc *tl);
 
 /* vcc_symb.c */
 struct symbol *VCC_AddSymbolStr(struct vcc *tl, const char *name, enum symkind);
-struct symbol *VCC_AddSymbolTok(struct vcc *tl, const struct token *t, enum symkind kind);
+struct symbol *VCC_AddSymbolTok(struct vcc *tl, const struct token *t,
+    enum symkind kind);
 struct symbol *VCC_GetSymbolTok(struct vcc *tl, const struct token *tok,
     enum symkind);
 struct symbol *VCC_FindSymbol(struct vcc *tl,
diff --git a/lib/libvcl/vcc_vmod.c b/lib/libvcl/vcc_vmod.c
index 55b43d7..bd9f366 100644
--- a/lib/libvcl/vcc_vmod.c
+++ b/lib/libvcl/vcc_vmod.c
@@ -163,7 +163,8 @@ vcc_ParseImport(struct vcc *tl)
 		p = *spec;
 		if (!strcmp(p, "INIT")) {
 			p += strlen(p) + 1;
-			Fi(tl, 0, "\t%s(&vmod_priv_%.*s, &VCL_conf);\n", p, PF(mod));
+			Fi(tl, 0, "\t%s(&vmod_priv_%.*s, &VCL_conf);\n",
+			    p, PF(mod));
 		} else {
 			sym = VCC_AddSymbolStr(tl, p, SYM_FUNC);
 			ERRCHK(tl);
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index 065948a..c4128ea 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES = \
 dist_man_MANS = vmod_std.3
 
 vmoddir = $(pkglibdir)/vmods
+vmod_srcdir = $(top_srcdir)/lib/libvmod_std
 vmod_LTLIBRARIES = libvmod_std.la
 
 libvmod_std_la_LDFLAGS = -module -export-dynamic -avoid-version
@@ -19,8 +20,8 @@ libvmod_std_la_SOURCES = \
 	vmod_std_fileread.c \
 	vmod_std_conversions.c
 
-vcc_if.c vcc_if.h: $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
-	@PYTHON@ $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
+vcc_if.c vcc_if.h: $(vmod_srcdir)/vmod.py $(vmod_srcdir)/vmod.vcc 
+	@PYTHON@ $(vmod_srcdir)/vmod.py $(vmod_srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.py vmod.vcc
 
diff --git a/lib/libvmod_std/vmod.py b/lib/libvmod_std/vmod.py
index 6a9b4fc..e409628 100755
--- a/lib/libvmod_std/vmod.py
+++ b/lib/libvmod_std/vmod.py
@@ -223,12 +223,14 @@ while True:
 		if at == "ENUM":
 			if tq == None:
 				raise Exception(
-				    "Argument type '%s' needs qualifier {...}" % at)
+				    "Argument type '%s' needs qualifier {...}"
+				    % at)
 			at=parse_enum(tq)
 
 		elif tq != None:
 			raise Exception(
-			    "Argument type '%s' cannot be qualified with {...}" % at)
+			    "Argument type '%s' cannot be qualified with {...}"
+			    % at)
 
 		vargs.append(at)
 
@@ -246,7 +248,8 @@ def dumps(s):
 #######################################################################
 
 if initname != "":
-	plist += "int " + initname + "(struct vmod_priv *, const struct VCL_conf *);\n"
+	plist += "int " + initname 
+	plist += "(struct vmod_priv *, const struct VCL_conf *);\n"
 	pstruct += "\tvmod_init_f\t*_init;\n"
 	pinit += "\t" + initname + ",\n"
 	slist += '\t"INIT\\0Vmod_Func_' + modname + '._init",\n'
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 89e4f50..154d8ca 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -59,8 +59,8 @@ struct frfile {
 	VTAILQ_ENTRY(frfile)		list;
 };
 
-static VTAILQ_HEAD(, frfile)		frlist = VTAILQ_HEAD_INITIALIZER(frlist);
-static pthread_mutex_t			frmtx = PTHREAD_MUTEX_INITIALIZER;
+static VTAILQ_HEAD(, frfile)	frlist = VTAILQ_HEAD_INITIALIZER(frlist);
+static pthread_mutex_t		frmtx = PTHREAD_MUTEX_INITIALIZER;
 
 static void
 free_frfile(void *ptr)



From perbu at varnish-cache.org  Sun Dec 18 09:16:20 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Sun, 18 Dec 2011 10:16:20 +0100
Subject: [master] 23e4c60 updated syntax, thanks to Chris Handy for spotting it
Message-ID: <E1RcCqy-00027f-37@project.varnish-software.com>

commit 23e4c6034feb5839dc78eb954baa36701692a790
Author: Per Buer <perbu at varnish-software.com>
Date:   Sun Dec 18 10:16:16 2011 +0100

    updated syntax, thanks to Chris Handy for spotting it

diff --git a/doc/sphinx/tutorial/increasing_your_hitrate.rst b/doc/sphinx/tutorial/increasing_your_hitrate.rst
index 31e32d0..0f0cbe8 100644
--- a/doc/sphinx/tutorial/increasing_your_hitrate.rst
+++ b/doc/sphinx/tutorial/increasing_your_hitrate.rst
@@ -32,8 +32,8 @@ Tool: varnishlog
 
 When you have identified the an URL which is frequently sent to the
 backend you can use varnishlog to have a look at the whole request.
-``varnishlog -c -o /foo/bar`` will give the whole (-o) requests coming
-from the client (-c) matching /foo/bar. 
+``varnishlog -c -m 'RxURL:^/foo/bar`` will give the whole (-o)
+requests coming from the client (-c) matching /foo/bar.
 
 For extended diagnostics headers, see
 http://www.varnish-cache.org/trac/wiki/VCLExampleHitMissHeader



From phk at varnish-cache.org  Mon Dec 19 10:04:53 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 19 Dec 2011 11:04:53 +0100
Subject: [master] 55d8e88 Split waiter::cache and waiter:mgt out from
	waiter::common
Message-ID: <E1Rca5V-0003Du-RA@project.varnish-software.com>

commit 55d8e88dfface89b6d4a38f3afc48863ccdc2b04
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 19 10:04:28 2011 +0000

    Split waiter::cache and waiter:mgt out from waiter::common

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 0c3427e..8a925b9 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -76,7 +76,8 @@ varnishd_SOURCES = \
 	storage/storage_persistent_subr.c \
 	storage/storage_synth.c \
 	storage/storage_umem.c \
-	waiter/waiter_common.c \
+	waiter/mgt_waiter.c \
+	waiter/cache_waiter.c \
 	waiter/cache_waiter_epoll.c \
 	waiter/cache_waiter_kqueue.c \
 	waiter/cache_waiter_poll.c \
@@ -96,7 +97,7 @@ noinst_HEADERS = \
 	mgt/mgt_param.h \
 	storage/storage.h \
 	storage/storage_persistent.h \
-	waiter/cache_waiter.h
+	waiter/waiter.h
 
 varnishd_CFLAGS = \
 	@PCRE_CFLAGS@ \
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 2189104..48e934d 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -35,7 +35,7 @@
 #include "cache.h"
 #include "common/heritage.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "hash/hash_slinger.h"
 
 volatile struct params	*cache_param;
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 94a4c09..6daf807 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -42,7 +42,7 @@
 #include "common/heritage.h"
 
 #include "cache_backend.h"
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vcl.h"
 
 /*
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index afa069a..a4d8a28 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -48,7 +48,7 @@
 #include "cache.h"
 #include "common/heritage.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vtcp.h"
 #include "vtim.h"
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 21d7f51..19292ea 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -40,7 +40,7 @@
 
 #include "cache.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 
 /*--------------------------------------------------------------------*/
 
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 128364c..f7f1dd0 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -43,7 +43,7 @@
 #include "common/params.h"
 
 #include "mgt/mgt_param.h"
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vav.h"
 #include "vcli.h"
 #include "vcli_common.h"
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
new file mode 100644
index 0000000..bf5717b
--- /dev/null
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "common/common.h"
+
+#include "waiter/waiter.h"
+
+const char *
+WAIT_GetName(void)
+{
+
+	if (waiter != NULL)
+		return (waiter->name);
+	else
+		return ("no_waiter");
+}
+
+void
+WAIT_Init(void)
+{
+
+	AN(waiter);
+	AN(waiter->name);
+	AN(waiter->init);
+	AN(waiter->pass);
+}
diff --git a/bin/varnishd/waiter/cache_waiter.h b/bin/varnishd/waiter/cache_waiter.h
deleted file mode 100644
index 1d6e679..0000000
--- a/bin/varnishd/waiter/cache_waiter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2011 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-struct sess;
-
-typedef void* waiter_init_f(void);
-typedef void waiter_pass_f(void *priv, const struct sess *);
-
-struct waiter {
-	const char		*name;
-	waiter_init_f		*init;
-	waiter_pass_f		*pass;
-};
-
-extern struct waiter const * waiter;
-
-#if defined(HAVE_EPOLL_CTL)
-extern const struct waiter waiter_epoll;
-#endif
-
-#if defined(HAVE_KQUEUE)
-extern const struct waiter waiter_kqueue;
-#endif
-
-#if defined(HAVE_PORT_CREATE)
-extern const struct waiter waiter_ports;
-#endif
-
-
-/* cache_session.c */
-void SES_Handle(struct sess *sp, int status);
-
-/* cache_waiter.c */
-extern const struct waiter waiter_poll;
-const char *WAIT_GetName(void);
-void WAIT_tweak_waiter(struct cli *cli, const char *arg);
-void WAIT_Init(void);
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 06cd8bb..ca0d29f 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -42,7 +42,7 @@
 
 #include "cache/cache.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vtim.h"
 
 #ifndef EPOLLRDHUP
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 7ceb80c..e9ec1ec 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -44,7 +44,7 @@
 
 #include "cache/cache.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vtim.h"
 
 #define NKEV	100
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index f6be13d..681b48d 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -35,7 +35,7 @@
 
 #include "cache/cache.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vtim.h"
 
 #define NEEV	128
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index ce2afc3..7717196 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -42,7 +42,7 @@
 
 #include "cache/cache.h"
 
-#include "waiter/cache_waiter.h"
+#include "waiter/waiter.h"
 #include "vtim.h"
 
 #define MAX_EVENTS 256
diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
new file mode 100644
index 0000000..d2816a8
--- /dev/null
+++ b/bin/varnishd/waiter/mgt_waiter.c
@@ -0,0 +1,90 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "common/common.h"
+
+#include "waiter/waiter.h"
+#include "vcli.h"
+#include "vcli_priv.h"
+
+static const struct waiter *const vca_waiters[] = {
+    #if defined(HAVE_KQUEUE)
+	&waiter_kqueue,
+    #endif
+    #if defined(HAVE_EPOLL_CTL)
+	&waiter_epoll,
+    #endif
+    #if defined(HAVE_PORT_CREATE)
+	&waiter_ports,
+    #endif
+	&waiter_poll,
+	NULL,
+};
+
+struct waiter const *waiter;
+
+void
+WAIT_tweak_waiter(struct cli *cli, const char *arg)
+{
+	int i;
+
+	ASSERT_MGT();
+
+	if (arg == NULL) {
+		if (waiter == NULL)
+			VCLI_Out(cli, "default");
+		else
+			VCLI_Out(cli, "%s", waiter->name);
+
+		VCLI_Out(cli, " (");
+		for (i = 0; vca_waiters[i] != NULL; i++)
+			VCLI_Out(cli, "%s%s", i == 0 ? "" : ", ",
+			    vca_waiters[i]->name);
+		VCLI_Out(cli, ")");
+		return;
+	}
+	if (!strcmp(arg, "default")) {
+		waiter = vca_waiters[0];
+		return;
+	}
+	for (i = 0; vca_waiters[i]; i++) {
+		if (!strcmp(arg, vca_waiters[i]->name)) {
+			waiter = vca_waiters[i];
+			return;
+		}
+	}
+	VCLI_Out(cli, "Unknown waiter");
+	VCLI_SetResult(cli, CLIS_PARAM);
+}
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
new file mode 100644
index 0000000..e9c3cdc
--- /dev/null
+++ b/bin/varnishd/waiter/waiter.h
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+struct sess;
+
+typedef void* waiter_init_f(void);
+typedef void waiter_pass_f(void *priv, const struct sess *);
+
+struct waiter {
+	const char		*name;
+	waiter_init_f		*init;
+	waiter_pass_f		*pass;
+};
+
+/* mgt_waiter.c */
+extern struct waiter const * waiter;
+void WAIT_tweak_waiter(struct cli *cli, const char *arg);
+
+#if defined(HAVE_EPOLL_CTL)
+extern const struct waiter waiter_epoll;
+#endif
+
+#if defined(HAVE_KQUEUE)
+extern const struct waiter waiter_kqueue;
+#endif
+
+#if defined(HAVE_PORT_CREATE)
+extern const struct waiter waiter_ports;
+#endif
+
+extern const struct waiter waiter_poll;
+
+/* cache_session.c */
+void SES_Handle(struct sess *sp, int status);
+
+/* cache_waiter.c */
+const char *WAIT_GetName(void);
+void WAIT_Init(void);
diff --git a/bin/varnishd/waiter/waiter_common.c b/bin/varnishd/waiter/waiter_common.c
deleted file mode 100644
index e09a296..0000000
--- a/bin/varnishd/waiter/waiter_common.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2011 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include "config.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "common/common.h"
-
-#include "waiter/cache_waiter.h"
-#include "vcli.h"
-#include "vcli_priv.h"
-
-static const struct waiter * const vca_waiters[] = {
-    #if defined(HAVE_KQUEUE)
-	&waiter_kqueue,
-    #endif
-    #if defined(HAVE_EPOLL_CTL)
-	&waiter_epoll,
-    #endif
-    #if defined(HAVE_PORT_CREATE)
-	&waiter_ports,
-    #endif
-	&waiter_poll,
-	NULL,
-};
-
-struct waiter const * waiter;
-
-const char *
-WAIT_GetName(void)
-{
-
-	if (waiter != NULL)
-		return (waiter->name);
-	else
-		return ("no_waiter");
-}
-
-void
-WAIT_tweak_waiter(struct cli *cli, const char *arg)
-{
-	int i;
-
-	ASSERT_MGT();
-
-	if (arg == NULL) {
-		if (waiter == NULL)
-			VCLI_Out(cli, "default");
-		else
-			VCLI_Out(cli, "%s", waiter->name);
-
-		VCLI_Out(cli, " (");
-		for (i = 0; vca_waiters[i] != NULL; i++)
-			VCLI_Out(cli, "%s%s", i == 0 ? "" : ", ",
-			    vca_waiters[i]->name);
-		VCLI_Out(cli, ")");
-		return;
-	}
-	if (!strcmp(arg, "default")) {
-		waiter = NULL;
-		return;
-	}
-	for (i = 0; vca_waiters[i]; i++) {
-		if (!strcmp(arg, vca_waiters[i]->name)) {
-			waiter = vca_waiters[i];
-			return;
-		}
-	}
-	VCLI_Out(cli, "Unknown waiter");
-	VCLI_SetResult(cli, CLIS_PARAM);
-}
-
-void
-WAIT_Init(void)
-{
-
-	if (waiter == NULL)
-		waiter = vca_waiters[0];
-
-	AN(waiter);
-	AN(waiter->name);
-	AN(waiter->init);
-	AN(waiter->pass);
-}



From phk at varnish-cache.org  Mon Dec 19 10:19:04 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 19 Dec 2011 11:19:04 +0100
Subject: [master] ae3733f Move Pool_Wait() to WAIT_Enter() where it belongs
Message-ID: <E1RcaJE-0004rJ-PS@project.varnish-software.com>

commit ae3733fb53a2c4fb21a720eb834dcc43b90d0577
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 19 10:18:46 2011 +0000

    Move Pool_Wait() to WAIT_Enter() where it belongs

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 9601270..0270f3b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -868,7 +868,6 @@ void PipeSession(struct sess *sp);
 /* cache_pool.c */
 void Pool_Init(void);
 void Pool_Work_Thread(void *priv, struct worker *w);
-void Pool_Wait(struct sess *sp);
 int Pool_Schedule(struct pool *pp, struct sess *sp);
 
 #define WRW_IsReleased(w)	((w)->wrw.wfd == NULL)
@@ -893,6 +892,7 @@ void SES_Charge(struct sess *sp);
 struct sesspool *SES_NewPool(struct pool *pp);
 void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
 int SES_Schedule(struct sess *sp);
+void SES_Handle(struct sess *sp, int status);
 
 
 /* cache_shmlog.c */
@@ -964,6 +964,11 @@ void ESI_DeliverChild(const struct sess *);
 /* cache_vrt_vmod.c */
 void VMOD_Init(void);
 
+/* cache_waiter.c */
+void WAIT_Enter(struct sess *sp);
+void WAIT_Init(void);
+const char *WAIT_GetName(void);
+
 /* cache_wrk.c */
 
 void WRK_Init(void);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index aed15ee..520c620 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -121,7 +121,7 @@ cnt_wait(struct sess *sp)
 		WSP(sp, SLT_Debug, "herding");
 		wrk->stats.sess_herd++;
 		SES_Charge(sp);
-		Pool_Wait(sp);
+		WAIT_Enter(sp);
 		return (1);
 	}
 	if (i == 1) {
@@ -432,7 +432,7 @@ WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
 		return (0);
 	}
 	wrk->stats.sess_herd++;
-	Pool_Wait(sp);
+	WAIT_Enter(sp);
 	return (1);
 }
 
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index a4d8a28..e59bbd0 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -48,8 +48,6 @@
 #include "cache.h"
 #include "common/heritage.h"
 
-#include "waiter/waiter.h"
-#include "vtcp.h"
 #include "vtim.h"
 
 /*--------------------------------------------------------------------
@@ -82,8 +80,6 @@ pthread_condattr_setclock(pthread_condattr_t *attr, int foo)
 }
 #endif /* !CLOCK_MONOTONIC */
 
-static void *waiter_priv;
-
 VTAILQ_HEAD(workerhead, worker);
 
 struct poolsock {
@@ -350,29 +346,6 @@ Pool_Schedule(struct pool *pp, struct sess *sp)
 }
 
 /*--------------------------------------------------------------------
- * Wait for another request
- */
-
-void
-Pool_Wait(struct sess *sp)
-{
-
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
-	AZ(sp->vcl);
-	assert(sp->fd >= 0);
-	sp->wrk = NULL;
-
-	/*
-	 * Set nonblocking in the worker-thread, before passing to the
-	 * acceptor thread, to reduce syscall density of the latter.
-	 */
-	if (VTCP_nonblocking(sp->fd))
-		SES_Close(sp, "remote closed");
-	waiter->pass(waiter_priv, sp);
-}
-
-/*--------------------------------------------------------------------
  * Create another thread, if necessary & possible
  */
 
@@ -588,7 +561,6 @@ void
 Pool_Init(void)
 {
 
-	waiter_priv = waiter->init();
 	Lck_New(&pool_mtx, lck_wq);
 	AZ(pthread_create(&thr_pool_herder, NULL, pool_poolherder, NULL));
 }
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index bf5717b..8aa8684 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -33,10 +33,14 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "common/common.h"
+#include "cache/cache.h"
 
 #include "waiter/waiter.h"
 
+#include "vtcp.h"
+
+static void *waiter_priv;
+
 const char *
 WAIT_GetName(void)
 {
@@ -55,4 +59,24 @@ WAIT_Init(void)
 	AN(waiter->name);
 	AN(waiter->init);
 	AN(waiter->pass);
+	waiter_priv = waiter->init();
+}
+
+void
+WAIT_Enter(struct sess *sp)
+{
+
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
+	AZ(sp->vcl);
+	assert(sp->fd >= 0);
+	sp->wrk = NULL;
+
+	/*
+	* Set nonblocking in the worker-thread, before passing to the
+	* acceptor thread, to reduce syscall density of the latter.
+	*/
+	if (VTCP_nonblocking(sp->fd))
+		SES_Close(sp, "remote closed");
+	waiter->pass(waiter_priv, sp);
 }
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
index e9c3cdc..9f48884 100644
--- a/bin/varnishd/waiter/waiter.h
+++ b/bin/varnishd/waiter/waiter.h
@@ -56,10 +56,3 @@ extern const struct waiter waiter_ports;
 #endif
 
 extern const struct waiter waiter_poll;
-
-/* cache_session.c */
-void SES_Handle(struct sess *sp, int status);
-
-/* cache_waiter.c */
-const char *WAIT_GetName(void);
-void WAIT_Init(void);



From perbu at varnish-cache.org  Mon Dec 19 10:32:01 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 11:32:01 +0100
Subject: [master] 6f8d983 add a label so we can ref this in the user guide /
	tutorial
Message-ID: <E1RcaVl-000694-KP@project.varnish-software.com>

commit 6f8d983c178876d08631f9f15f66b95cd3b77dee
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 11:24:42 2011 +0100

    add a label so we can ref this in the user guide / tutorial

diff --git a/doc/sphinx/reference/varnishlog.rst b/doc/sphinx/reference/varnishlog.rst
index 9e6ada9..a90231f 100644
--- a/doc/sphinx/reference/varnishlog.rst
+++ b/doc/sphinx/reference/varnishlog.rst
@@ -1,3 +1,5 @@
+_reference-varnishlog:
+
 ==========
 varnishlog
 ==========



From perbu at varnish-cache.org  Mon Dec 19 10:32:01 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 11:32:01 +0100
Subject: [master] e578219 Add a label, fix a typo and remove -o (now default)
Message-ID: <E1RcaVl-000699-ME@project.varnish-software.com>

commit e5782194340ab76c06e8e4bc242f244fd18791f4
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 11:25:39 2011 +0100

    Add a label, fix a typo and remove -o (now default)

diff --git a/doc/sphinx/tutorial/logging.rst b/doc/sphinx/tutorial/logging.rst
index 070dc3d..331742f 100644
--- a/doc/sphinx/tutorial/logging.rst
+++ b/doc/sphinx/tutorial/logging.rst
@@ -1,3 +1,4 @@
+.. _tutorial-logging:
 
 Logging in Varnish
 ------------------
@@ -8,7 +9,7 @@ memory segment. When the end of the segment is reached we start over,
 overwriting old data. This is much, much faster then logging to a file
 and it doesn't require disk space.
 
-The flip side is that is you forget to have program actually write the
+The flip side is that if you forget to have program actually write the
 logs to disk they will disappear.
 
 varnishlog is one of the programs you can use to look at what Varnish
@@ -69,9 +70,6 @@ want to know are:
  show all cookie headers coming from the clients:
  ``$ varnishlog -c -i RxHeader -I Cookie``
 
--o 
- Group log entries by request ID.
-
 
 Now that Varnish seem to work OK it's time to put Varnish on port 80
 while we tune it.



From perbu at varnish-cache.org  Mon Dec 19 10:32:01 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 11:32:01 +0100
Subject: [master] 7402560 remove -i and -I,
	add -m and describe it. Simplify the docs. The user only needs to
	care about -m, really
Message-ID: <E1RcaVl-00069F-NY@project.varnish-software.com>

commit 7402560ab9ab74043b00b360e24edf9bb58f8060
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 11:30:26 2011 +0100

    remove -i and -I, add -m and describe it. Simplify the docs. The user only needs to care about -m, really

diff --git a/doc/sphinx/tutorial/logging.rst b/doc/sphinx/tutorial/logging.rst
index 331742f..68f1d87 100644
--- a/doc/sphinx/tutorial/logging.rst
+++ b/doc/sphinx/tutorial/logging.rst
@@ -60,16 +60,9 @@ want to know are:
 -c 
  Same as -b but for client side traffic.
 
--i tag
- Only show lines with a certain tag. "varnishlog -i SessionOpen" 
- will only give you new sessions. Note that the tags are case 
- insensitive. 
-
--I Regex
- Filter the data through a regex and only show the matching lines. To
- show all cookie headers coming from the clients:
- ``$ varnishlog -c -i RxHeader -I Cookie``
-
+-m tag:regex
+ Only list transactions where the tag matches a regular expression. If
+ it matches you will get the whole transaction.
 
 Now that Varnish seem to work OK it's time to put Varnish on port 80
 while we tune it.



From perbu at varnish-cache.org  Mon Dec 19 10:32:01 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 11:32:01 +0100
Subject: [master] f111f6f Remove the ref to -o for varnishlog Add a link to
	the varnishlog man page and the logging chapter in the tutorial
Message-ID: <E1RcaVl-00069O-Op@project.varnish-software.com>

commit f111f6f2df427527a5e88cc54d30ba2c02a493e6
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 11:31:44 2011 +0100

    Remove the ref to -o for varnishlog
    Add a link to the varnishlog man page and the logging chapter in the tutorial

diff --git a/doc/sphinx/tutorial/increasing_your_hitrate.rst b/doc/sphinx/tutorial/increasing_your_hitrate.rst
index 0f0cbe8..c5f0c6a 100644
--- a/doc/sphinx/tutorial/increasing_your_hitrate.rst
+++ b/doc/sphinx/tutorial/increasing_your_hitrate.rst
@@ -31,9 +31,11 @@ Tool: varnishlog
 ~~~~~~~~~~~~~~~~
 
 When you have identified the an URL which is frequently sent to the
-backend you can use varnishlog to have a look at the whole request.
-``varnishlog -c -m 'RxURL:^/foo/bar`` will give the whole (-o)
-requests coming from the client (-c) matching /foo/bar.
+backend you can use varnishlog to have a look at the request.
+``varnishlog -c -m 'RxURL:^/foo/bar`` will show you the requests
+coming from the client (-c) matching /foo/bar.
+
+For more information on how varnishlog works please see :ref:`tutorial-logging`.
 
 For extended diagnostics headers, see
 http://www.varnish-cache.org/trac/wiki/VCLExampleHitMissHeader



From perbu at varnish-cache.org  Mon Dec 19 10:32:01 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 11:32:01 +0100
Subject: [master] 59a3b91 Merge branch 'master' of
	ssh://git.varnish-cache.org/git/varnish-cache
Message-ID: <E1RcaVl-00069a-QZ@project.varnish-software.com>

commit 59a3b914752e25787807784f9ec4f464402340ec
Merge: f111f6f ae3733f
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 11:31:56 2011 +0100

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache



From phk at varnish-cache.org  Mon Dec 19 10:36:16 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 19 Dec 2011 11:36:16 +0100
Subject: [master] 3673967 Merge branch 'master' of
	ssh://git.varnish-cache.org/git/varnish-cache
Message-ID: <E1RcaZs-0007cq-N4@project.varnish-software.com>

commit 3673967c6bf261a2c1e1e8220239c98d71ad7393
Merge: 4c1e826 59a3b91
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 19 10:36:01 2011 +0000

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache



From phk at varnish-cache.org  Mon Dec 19 10:36:16 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 19 Dec 2011 11:36:16 +0100
Subject: [master] 4c1e826 Add an explict enum to tell a worker what to do
Message-ID: <E1RcaZs-0007cl-DH@project.varnish-software.com>

commit 4c1e82666039e0ffcd5a9b56ba9c342a59375d56
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 19 10:35:44 2011 +0000

    Add an explict enum to tell a worker what to do

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 0270f3b..14b9fe6 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -289,6 +289,13 @@ struct wrk_accept {
 
 /*--------------------------------------------------------------------*/
 
+enum e_do_what {
+	pool_do_inval = 0,
+	pool_do_sess,
+	pool_do_accept,
+	pool_do_die,
+};
+
 struct worker {
 	unsigned		magic;
 #define WORKER_MAGIC		0x6391adcf
@@ -301,6 +308,8 @@ struct worker {
 	struct dstat		stats;
 
 	/* Pool stuff */
+	enum e_do_what		do_what;
+
 	double			lastused;
 
 	struct wrw		wrw;
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index e59bbd0..1195b45 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -168,6 +168,7 @@ pool_accept(struct pool *pp, struct worker *w, const struct poolsock *ps)
 		assert(sizeof *wa2 == WS_Reserve(w2->ws, sizeof *wa2));
 		wa2 = (void*)w2->ws->f;
 		memcpy(wa2, wa, sizeof *wa);
+		w2->do_what = pool_do_accept;
 		AZ(pthread_cond_signal(&w2->cond));
 	}
 }
@@ -190,6 +191,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 	while (1) {
 
 		Lck_AssertHeld(&pp->mtx);
+		w->do_what = pool_do_inval;
 
 		CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
 		CHECK_OBJ_NOTNULL(w->resp, HTTP_MAGIC);
@@ -201,6 +203,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			/* Process queued requests, if any */
 			assert(pp->lqueue > 0);
 			VTAILQ_REMOVE(&pp->queue, w->sp, poollist);
+			w->do_what = pool_do_sess;
 			pp->lqueue--;
 		} else if (!VTAILQ_EMPTY(&pp->socks)) {
 			/* Accept on a socket */
@@ -215,6 +218,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 				continue;
 			}
 			VTAILQ_INSERT_TAIL(&pp->socks, ps, list);
+			w->do_what = pool_do_accept;
 		} else if (VTAILQ_EMPTY(&pp->socks)) {
 			/* Nothing to do: To sleep, perchance to dream ... */
 			if (isnan(w->lastused))
@@ -225,29 +229,27 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			(void)Lck_CondWait(&w->cond, &pp->mtx, NULL);
 		}
 
-		/*
-		 * If we got neither session or accepted a socket, we were
-		 * woken up to die to cull the herd.
-		 */
-		if (w->sp == NULL && w->ws->r == NULL)
+		if (w->do_what == pool_do_die)
 			break;
 
 		Lck_Unlock(&pp->mtx);
 
-		if (w->sp == NULL) {
+		if (w->do_what == pool_do_accept) {
 			/* Turn accepted socket into a session */
-			assert(w->ws->r != NULL);
+			AZ(w->sp);
+			AN(w->ws->r);
 			w->sp = SES_New(w, pp->sesspool);
 			if (w->sp == NULL)
 				VCA_FailSess(w);
 			else
 				VCA_SetupSess(w);
 			WS_Release(w->ws, 0);
+			w->do_what = pool_do_sess;
 		}
-		assert(w->ws->r == NULL);
 
-		if (w->sp != NULL) {
+		if (w->do_what == pool_do_sess) {
 			CHECK_OBJ_NOTNULL(w->sp, SESS_MAGIC);
+			AZ(w->ws->r);
 
 			stats_clean = 0;
 			w->lastused = NAN;
@@ -270,6 +272,8 @@ Pool_Work_Thread(void *priv, struct worker *w)
 				if (w->vcl != NULL)
 					VCL_Rel(&w->vcl);
 			}
+		} else {
+			WRONG("Invalid w->do_what");
 		}
 		stats_clean = WRK_TrySumStat(w);
 		Lck_Lock(&pp->mtx);
@@ -297,6 +301,7 @@ pool_queue(struct pool *pp, struct sess *sp)
 		VTAILQ_REMOVE(&pp->idle, w, list);
 		Lck_Unlock(&pp->mtx);
 		w->sp = sp;
+		w->do_what = pool_do_sess;
 		AZ(pthread_cond_signal(&w->cond));
 		return (0);
 	}
@@ -469,6 +474,7 @@ pool_herder(void *priv)
 			VSC_C_main->threads_destroyed++;
 			Lck_Unlock(&pool_mtx);
 			AZ(w->sp);
+			w->do_what = pool_do_die;
 			AZ(pthread_cond_signal(&w->cond));
 		}
 	}



From perbu at varnish-cache.org  Mon Dec 19 11:29:37 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 12:29:37 +0100
Subject: [master] 198823d add a ref to man varnishlog
Message-ID: <E1RcbPV-00020B-8x@project.varnish-software.com>

commit 198823dc4c715589bc03f7b6c45a05ac13db4e3e
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 12:29:11 2011 +0100

    add a ref to man varnishlog

diff --git a/doc/sphinx/tutorial/increasing_your_hitrate.rst b/doc/sphinx/tutorial/increasing_your_hitrate.rst
index c5f0c6a..83236d6 100644
--- a/doc/sphinx/tutorial/increasing_your_hitrate.rst
+++ b/doc/sphinx/tutorial/increasing_your_hitrate.rst
@@ -35,7 +35,8 @@ backend you can use varnishlog to have a look at the request.
 ``varnishlog -c -m 'RxURL:^/foo/bar`` will show you the requests
 coming from the client (-c) matching /foo/bar.
 
-For more information on how varnishlog works please see :ref:`tutorial-logging`.
+For more information on how varnishlog works please see
+:ref:`tutorial-logging` or man :ref:`ref-varnishlog`.
 
 For extended diagnostics headers, see
 http://www.varnish-cache.org/trac/wiki/VCLExampleHitMissHeader



From perbu at varnish-cache.org  Mon Dec 19 11:29:37 2011
From: perbu at varnish-cache.org (Per Buer)
Date: Mon, 19 Dec 2011 12:29:37 +0100
Subject: [master] 0d03649 clean up refs
Message-ID: <E1RcbPV-00020G-AE@project.varnish-software.com>

commit 0d0364905b418d43e55197efee41b04eea3e5e50
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Dec 19 12:29:33 2011 +0100

    clean up refs

diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 5d1fc77..4e2b3f2 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -1,3 +1,5 @@
+.. _ref-varnishd:
+
 =========
  varnishd
 =========
diff --git a/doc/sphinx/reference/varnishlog.rst b/doc/sphinx/reference/varnishlog.rst
index a90231f..f626332 100644
--- a/doc/sphinx/reference/varnishlog.rst
+++ b/doc/sphinx/reference/varnishlog.rst
@@ -1,4 +1,4 @@
-_reference-varnishlog:
+.. _ref-varnishlog:
 
 ==========
 varnishlog



From martin at varnish-cache.org  Mon Dec 19 14:42:40 2011
From: martin at varnish-cache.org (Martin Blix Grydeland)
Date: Mon, 19 Dec 2011 15:42:40 +0100
Subject: [master] ee43963 Force file permissions 0755 on compiled vcl .so file
	to make sure it is readable by the unprivileged user.
Message-ID: <E1RceQK-0008LG-V7@project.varnish-software.com>

commit ee439631b413cc5505e384c233ca36930cd33a70
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Dec 19 14:59:12 2011 +0100

    Force file permissions 0755 on compiled vcl .so file to make sure it
    is readable by the unprivileged user.
    
    Fixes: #1072

diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index ec117db..12433ad 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "mgt/mgt.h"
 
@@ -272,6 +273,14 @@ mgt_run_cc(const char *vcl, struct vsb *sb, int C_flag)
 	if (!i)
 		i = VSUB_run(sb, run_dlopen, of, "dlopen", 10);
 
+	/* Ensure the file is readable to the unprivileged user */
+	if (!i) {
+		i = chmod(of, 0755);
+		if (i)
+			VSB_printf(sb, "Failed to set permissions on %s: %s",
+				   of, strerror(errno));
+	}
+
 	if (i) {
 		(void)unlink(of);
 		return (NULL);



From phk at varnish-cache.org  Tue Dec 20 09:01:46 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 10:01:46 +0100
Subject: [master] 8624d49 Move the client IP+port onto the sess structure
	instead of the sess workspace.
Message-ID: <E1RcvZy-000266-RW@project.varnish-software.com>

commit 8624d492a504d40f0794b00a6b036bfd929822d9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 09:01:14 2011 +0000

    Move the client IP+port onto the sess structure instead of the
    sess workspace.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 14b9fe6..d1d67b6 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -600,8 +600,8 @@ struct sess {
 	struct listen_sock	*mylsock;
 
 	/* formatted ascii client address */
-	char			*addr;
-	char			*port;
+	char			addr[ADDR_BUFSIZE];
+	char			port[PORT_BUFSIZE];
 	char			*client_identity;
 
 	/* HTTP request */
@@ -662,7 +662,7 @@ struct sess {
 /* Prototypes etc ----------------------------------------------------*/
 
 /* cache_acceptor.c */
-void VCA_Prep(struct sess *sp);
+void VCA_Prep(const struct sess *sp);
 void VCA_Init(void);
 void VCA_Shutdown(void);
 int VCA_Accept(struct listen_sock *ls, struct wrk_accept *wa);
@@ -997,7 +997,6 @@ void WS_ReleaseP(struct ws *ws, char *ptr);
 void WS_Assert(const struct ws *ws);
 void WS_Reset(struct ws *ws, char *p);
 char *WS_Alloc(struct ws *ws, unsigned bytes);
-char *WS_Dup(struct ws *ws, const char *);
 char *WS_Snapshot(struct ws *ws);
 unsigned WS_Free(const struct ws *ws);
 
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 661b053..6ef9aec 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -113,27 +113,9 @@ sock_test(int fd)
  */
 
 void
-VCA_Prep(struct sess *sp)
+VCA_Prep(const struct sess *sp)
 {
-	char addr[VTCP_ADDRBUFSIZE];
-	char port[VTCP_PORTBUFSIZE];
-
-	VTCP_name(&sp->sockaddr, sp->sockaddrlen,
-	    addr, sizeof addr, port, sizeof port);
-	sp->addr = WS_Dup(sp->ws, addr);
-	sp->port = WS_Dup(sp->ws, port);
-	if (cache_param->log_local_addr) {
-		AZ(getsockname(sp->fd, (void*)&sp->mysockaddr,
-		    &sp->mysockaddrlen));
-		VTCP_name(&sp->mysockaddr, sp->mysockaddrlen,
-		    addr, sizeof addr, port, sizeof port);
-		WSP(sp, SLT_SessionOpen, "%s %s %s %s",
-		    sp->addr, sp->port, addr, port);
-	} else {
-		WSP(sp, SLT_SessionOpen, "%s %s %s",
-		    sp->addr, sp->port, sp->mylsock->name);
-	}
-	sp->acct_ses.first = sp->t_open;
+
 	if (need_test)
 		sock_test(sp->fd);
 	if (need_linger)
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 520c620..a6ea594 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -64,6 +64,8 @@ DOT acceptor -> first [style=bold,color=green]
 
 #include "cache.h"
 
+#include "common/heritage.h"
+
 #include "hash/hash_slinger.h"
 #include "vcl.h"
 #include "vcli_priv.h"
@@ -1005,6 +1007,8 @@ static int
 cnt_first(struct sess *sp)
 {
 	struct worker *wrk;
+	char laddr[ADDR_BUFSIZE];
+	char lport[PORT_BUFSIZE];
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
@@ -1020,6 +1024,21 @@ cnt_first(struct sess *sp)
 	assert(sp->xid == 0);
 	assert(sp->restarts == 0);
 	AZ(sp->esi_level);
+	VTCP_name(&sp->sockaddr, sp->sockaddrlen,
+	    sp->addr, sizeof sp->addr, sp->port, sizeof sp->port);
+	if (cache_param->log_local_addr) {
+		AZ(getsockname(sp->fd, (void*)&sp->mysockaddr,
+		    &sp->mysockaddrlen));
+		VTCP_name(&sp->mysockaddr, sp->mysockaddrlen,
+		    laddr, sizeof laddr, lport, sizeof lport);
+		WSP(sp, SLT_SessionOpen, "%s %s %s %s",
+		    sp->addr, sp->port, laddr, lport);
+	} else {
+		WSP(sp, SLT_SessionOpen, "%s %s %s",
+		    sp->addr, sp->port, sp->mylsock->name);
+	}
+	sp->acct_ses.first = sp->t_open;
+
 	VCA_Prep(sp);
 
 	/* Record the session watermark */
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 19292ea..65dd5c7 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -321,7 +321,6 @@ SES_Delete(struct sess *sp, const char *reason)
 {
 	struct acct *b;
 	struct sessmem *sm;
-	static char noaddr[] = "-";
 	struct worker *wrk;
 	struct sesspool *pp;
 
@@ -340,10 +339,10 @@ SES_Delete(struct sess *sp, const char *reason)
 	assert(sp->fd < 0);
 
 	AZ(sp->vcl);
-	if (sp->addr == NULL)
-		sp->addr = noaddr;
-	if (sp->port == NULL)
-		sp->port = noaddr;
+	if (*sp->addr == '\0')
+		strcpy(sp->addr, "-");
+	if (*sp->port == '\0')
+		strcpy(sp->addr, "-");
 
 	b = &sp->acct_ses;
 	assert(!isnan(b->first));
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index b5f48d3..be38496 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -116,22 +116,6 @@ WS_Alloc(struct ws *ws, unsigned bytes)
 	return (r);
 }
 
-char *
-WS_Dup(struct ws *ws, const char *s)
-{
-	unsigned l;
-	char *p;
-
-	WS_Assert(ws);
-	l = strlen(s) + 1;
-	p = WS_Alloc(ws, l);
-	if (p != NULL)
-		memcpy(p, s, l);
-	DSL(0x02, SLT_Debug, 0, "WS_Dup(%p, \"%s\") = %p", ws, s, p);
-	WS_Assert(ws);
-	return (p);
-}
-
 unsigned
 WS_Free(const struct ws *ws)
 {
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 3509f25..7fcc7ec 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -60,6 +60,15 @@ struct cli;
  */
 #define __state_variable__(xxx)		/*lint -esym(838,xxx) */
 
+/**********************************************************************
+ * NI_MAXHOST and less so NI_MAXSERV, are ridiculously large for numeric
+ * representations of TCP/IP socket addresses, so we use our own.
+ */
+
+#define ADDR_BUFSIZE	64
+#define PORT_BUFSIZE	8
+
+
 /**********************************************************************/
 
 /* Name of transient storage */
diff --git a/bin/varnishtest/tests/r00693.vtc b/bin/varnishtest/tests/r00693.vtc
index 37b0a98..ce65be5 100644
--- a/bin/varnishtest/tests/r00693.vtc
+++ b/bin/varnishtest/tests/r00693.vtc
@@ -51,8 +51,8 @@ varnish v1 -arg "-p sess_workspace=1024" -vcl+backend {
 			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" +
-			"0123456";
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcde";
 		set req.http.baz = "BAZ";
 		return (pass);
 	}



From phk at varnish-cache.org  Tue Dec 20 09:56:52 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 10:56:52 +0100
Subject: [master] ffb8801 Simplify the dance around sock acceptance.
Message-ID: <E1RcwRI-0005nW-PX@project.varnish-software.com>

commit ffb8801b909d842072d4c0282d2820e7ee7aa029
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 09:54:05 2011 +0000

    Simplify the dance around sock acceptance.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index d1d67b6..2c8d730 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -293,6 +293,7 @@ enum e_do_what {
 	pool_do_inval = 0,
 	pool_do_sess,
 	pool_do_accept,
+	pool_do_nothing,
 	pool_do_die,
 };
 
@@ -662,7 +663,6 @@ struct sess {
 /* Prototypes etc ----------------------------------------------------*/
 
 /* cache_acceptor.c */
-void VCA_Prep(const struct sess *sp);
 void VCA_Init(void);
 void VCA_Shutdown(void);
 int VCA_Accept(struct listen_sock *ls, struct wrk_accept *wa);
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 6ef9aec..2814f87 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -26,6 +26,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * This source file has the various trickery surrounding the accept/listen
+ * sockets.
+ *
+ * The actual acceptance is done from cache_pool.c, by calling
+ * into VCA_Accept() in this file.
+ *
+ * Once the session is allocated we move into it with a call to 
+ * VCA_SetupSess().
+ *
+ * If we fail to allocate a session we call VCA_FailSess() to clean up
+ * and initiate pacing.
  */
 
 #include "config.h"
@@ -41,6 +52,9 @@
 static pthread_t	VCA_thread;
 static struct timeval	tv_sndtimeo;
 static struct timeval	tv_rcvtimeo;
+static int hack_ready;
+static double vca_pace = 0.0;
+static struct lock pace_mtx;
 
 /*--------------------------------------------------------------------
  * We want to get out of any kind of trouble-hit TCP connections as fast
@@ -54,6 +68,12 @@ static const struct linger linger = {
 
 static unsigned char	need_sndtimeo, need_rcvtimeo, need_linger, need_test;
 
+/*--------------------------------------------------------------------
+ * Some kernels have bugs/limitations with respect to which options are
+ * inherited from the accept/listen socket, so we have to keep track of
+ * which, if any, sockopts we have to set on the accepted socket.
+ */
+
 static void
 sock_test(int fd)
 {
@@ -108,12 +128,12 @@ sock_test(int fd)
 }
 
 /*--------------------------------------------------------------------
- * Called once the workerthread gets hold of the session, to do setup
- * setup overhead, we don't want to bother the acceptor thread with.
+ * Called once the workerthread gets hold of the session, to fix up
+ * any socket options that need it.
  */
 
-void
-VCA_Prep(const struct sess *sp)
+static void
+vca_prep(const struct sess *sp)
 {
 
 	if (need_test)
@@ -138,9 +158,6 @@ VCA_Prep(const struct sess *sp)
  * shortage if possible.
  */
 
-static double vca_pace = 0.0;
-static struct lock pace_mtx;
-
 static void
 vca_pace_check(void)
 {
@@ -183,8 +200,6 @@ vca_pace_good(void)
  * Accept on a listen socket, and handle error returns.
  */
 
-static int hack_ready;
-
 int
 VCA_Accept(struct listen_sock *ls, struct wrk_accept *wa)
 {
@@ -243,7 +258,9 @@ VCA_FailSess(struct worker *w)
 	vca_pace_bad();
 }
 
-/*--------------------------------------------------------------------*/
+/*--------------------------------------------------------------------
+ * We have allocated a session, move our info into it.
+ */
 
 void
 VCA_SetupSess(struct worker *w)
@@ -268,6 +285,7 @@ VCA_SetupSess(struct worker *w)
 	sp->step = STP_FIRST;
 	vca_pace_good();
 	w->stats.sess_conn++;
+	vca_prep(sp);
 }
 
 /*--------------------------------------------------------------------*/
@@ -363,7 +381,7 @@ ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
 
 	/*
 	 * This CLI command is primarily used by varnishtest.  Don't
-	 * respond until liste(2) has been called, in order to avoid
+	 * respond until listen(2) has been called, in order to avoid
 	 * a race where varnishtest::client would attempt to connect(2)
 	 * before listen(2) has been called.
 	 */
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index a6ea594..6b9b353 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1039,8 +1039,6 @@ cnt_first(struct sess *sp)
 	}
 	sp->acct_ses.first = sp->t_open;
 
-	VCA_Prep(sp);
-
 	/* Record the session watermark */
 	sp->ws_ses = WS_Snapshot(sp->ws);
 
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 1195b45..c557edd 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -239,12 +239,14 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			AZ(w->sp);
 			AN(w->ws->r);
 			w->sp = SES_New(w, pp->sesspool);
-			if (w->sp == NULL)
+			if (w->sp == NULL) {
 				VCA_FailSess(w);
-			else
+				w->do_what = pool_do_nothing;
+			} else {
 				VCA_SetupSess(w);
+				w->do_what = pool_do_sess;
+			}
 			WS_Release(w->ws, 0);
-			w->do_what = pool_do_sess;
 		}
 
 		if (w->do_what == pool_do_sess) {
@@ -272,6 +274,8 @@ Pool_Work_Thread(void *priv, struct worker *w)
 				if (w->vcl != NULL)
 					VCL_Rel(&w->vcl);
 			}
+		} else if (w->do_what == pool_do_nothing) {
+			/* we already did */
 		} else {
 			WRONG("Invalid w->do_what");
 		}



From phk at varnish-cache.org  Tue Dec 20 11:43:59 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 12:43:59 +0100
Subject: [master] ad22891 Loose the session watermark
Message-ID: <E1Rcy6x-00083g-3X@project.varnish-software.com>

commit ad228918a305d4971143d14c93b05ecfe3a6e703
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 11:43:48 2011 +0000

    Loose the session watermark

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 2c8d730..08f8adc 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -611,7 +611,6 @@ struct sess {
 	struct http		*http0;
 
 	struct ws		ws[1];
-	char			*ws_ses;	/* WS above session data */
 	char			*ws_req;	/* WS above request data */
 
 	unsigned char		digest[DIGEST_LEN];
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 2814f87..a9b8c0b 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -32,7 +32,7 @@
  * The actual acceptance is done from cache_pool.c, by calling
  * into VCA_Accept() in this file.
  *
- * Once the session is allocated we move into it with a call to 
+ * Once the session is allocated we move into it with a call to
  * VCA_SetupSess().
  *
  * If we fail to allocate a session we call VCA_FailSess() to clean up
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 6b9b353..e7c7fe2 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -414,7 +414,7 @@ WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
 	if (wrk->stats.client_req >= cache_param->wthread_stats_rate)
 		WRK_SumStat(wrk);
 	/* Reset the workspace to the session-watermark */
-	WS_Reset(sp->ws, sp->ws_ses);
+	WS_Reset(sp->ws, NULL);
 	WS_Reset(wrk->ws, NULL);
 
 	i = HTC_Reinit(sp->htc);
@@ -1039,9 +1039,6 @@ cnt_first(struct sess *sp)
 	}
 	sp->acct_ses.first = sp->t_open;
 
-	/* Record the session watermark */
-	sp->ws_ses = WS_Snapshot(sp->ws);
-
 	/* Receive a HTTP protocol request */
 	HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id,
 	    cache_param->http_req_size,



From apj at varnish-cache.org  Tue Dec 20 15:18:26 2011
From: apj at varnish-cache.org (Andreas Plesner Jacobsen)
Date: Tue, 20 Dec 2011 16:18:26 +0100
Subject: [master] 203ab6e Fix syntax for 3.0
Message-ID: <E1Rd1SU-0000UV-Oa@project.varnish-software.com>

commit 203ab6e7109b5d382e802c747f9b273c5f605bf7
Author: Andreas Plesner Jacobsen <apj at mutt.dk>
Date:   Tue Dec 20 16:18:12 2011 +0100

    Fix syntax for 3.0

diff --git a/doc/sphinx/tutorial/cookies.rst b/doc/sphinx/tutorial/cookies.rst
index ab59e21..0278712 100644
--- a/doc/sphinx/tutorial/cookies.rst
+++ b/doc/sphinx/tutorial/cookies.rst
@@ -50,7 +50,7 @@ cookies named COOKIE1 and COOKIE2 and you can marvel at it::
 
   sub vcl_recv {
     if (req.http.Cookie) {
-      set req.http.Cookie = ";" req.http.Cookie;
+      set req.http.Cookie = ";" + req.http.Cookie;
       set req.http.Cookie = regsuball(req.http.Cookie, "; +", ";");
       set req.http.Cookie = regsuball(req.http.Cookie, ";(COOKIE1|COOKIE2)=", "; \1=");
       set req.http.Cookie = regsuball(req.http.Cookie, ";[^ ][^;]*", "");



From phk at varnish-cache.org  Tue Dec 20 20:10:05 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 21:10:05 +0100
Subject: [master] c57dab7 Curse WG14
Message-ID: <E1Rd60j-00030F-Bn@project.varnish-software.com>

commit c57dab774f86e66334c304990ca2feacbb8ce840
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 20:09:54 2011 +0000

    Curse WG14

diff --git a/doc/sphinx/phk/index.rst b/doc/sphinx/phk/index.rst
index 6264f55..822434c 100644
--- a/doc/sphinx/phk/index.rst
+++ b/doc/sphinx/phk/index.rst
@@ -8,6 +8,7 @@ You may or may not want to know what Poul-Henning think.
 
 .. toctree::
 
+	thetoolsweworkwith.rst
 	three-zero.rst
 	ssl.rst
 	gzip.rst
diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst
new file mode 100644
index 0000000..cff365b
--- /dev/null
+++ b/doc/sphinx/phk/thetoolsweworkwith.rst
@@ -0,0 +1,211 @@
+.. _phk_thetoolsweworkwith:
+
+======================
+The Tools We Work With
+======================
+
+"Only amateurs were limited by their tools" is an old wisdom, and
+the world is littered with art and architecture that very much
+proves this point.
+
+But as amazing as the Aquaeduct of Segovia is, tools are the reason
+why it looks nowhere near as fantastic as the Sydney Opera House.
+
+Concrete has been known since antiquity, but steel-reinforced
+concrete and massive numerical calculations of stress-distribution,
+is the tools that makes the difference between using concrete as a
+filler material between stones, and as gravity-defying curved but
+perfectly safe load-bearing wall.
+
+My tool for writing Varnish is the C-language which in many ways
+is unique amongst all of the computer programming languages for
+having no ambitions.
+
+The C language was invented as a portable assembler language, it
+doesn't do objects and garbage-collection, it does numbers and
+pointers, just like your CPU.
+
+Compared to the high ambitions, then as now, of new programming
+languages, that was almost ridiculous unambitious.  Other people
+were trying to make their programming languages provably correct,
+or safe for multiprogramming and quite an effort went into using
+natural languages as programming languages.
+
+But C was written to write programs, not to research computer science
+and that's exactly what made it useful and popular.
+
+Unfortunately C fell in bad company over the years, and the reason
+for this outburst is that I just browsed the latest draft from the
+ISO-C standardisation working-group 14.
+
+I won't claim that it is enough to make grown men cry, but it
+certainly was enough to make me angry.
+
+Let me give you an example of their utter sillyness:
+
+The book which defined the C langauge had a list af reserved
+identifiers, all of them lower-case words.  The UNIX libraries
+defined a lot of functions, all of them lower-case words.
+
+When compiled, the assembler saw all of these words prefixed
+with an underscore, which made it easy to mix assembler and
+C code.
+
+All the macros for the C-preprocessor on the other hand, were
+UPPERCASE, making them easy to spot.
+
+Which meant that if you mixed upper and lower case, in your
+identifiers, you were safe: That wouldn't collide with anything.
+
+First the ISO-C standards people got confused about the leading
+underscore, and I'll leave you guessing as to what the current
+text actually means:
+
+	All identifiers that begin with an underscore and either
+	an uppercase letter or another underscore are always reserved
+	for any use.
+
+Feel free to guess.
+
+Next, they broke the upper/lower rule, by adding special keywords
+in mixed case, probably because they thought it looked nicer::
+
+	_Atomic, _Bool, _Noreturn &c
+
+Then, presumably, somebody pointed out that this looked ugly::
+
+	void _Noreturn foo(int bar);
+
+So they have come up with a #include file called <stdnoreturn.h>
+so that instead you can write::
+
+	#include <nostdreturn.h>
+	void noreturn foo(int bar);
+
+The <nostdreturn.h> file according to the standard shall have
+exactly this content::
+
+	#define noreturn _Noreturn
+
+Are you crying or laughing yet ?   You should be.
+
+Another thing brought by the new draft is an entirely new thread
+API, which is incompatible with the POSIX 'pthread' API which have
+been used for about 20 years now.
+
+If they had improved on the shortcomings of the pthreads, I would
+have cheered them on, because there are some very annoying mistakes
+in pthreads.
+
+But they didn't, in fact, as far as I can tell, the C1X draft's
+threads are worse than the 20 years older pthreads in all relevant
+aspects.
+
+For instance, neither pthreads nor C1X-threads offer a "assert I'm
+holding this mutex locked" facility.  I will posit that you cannot
+successfully develop real-world threaded programs and APIs that,
+or without wasting a lot of time debugging silly mistakes.
+
+If you look in the Varnish source code, which uses pthreads, you
+will see that I have wrapped pthread mutexes in my own little
+datastructure, to be able to do those asserts, and to get some
+usable statistics on lock-contention.
+
+Another example where C1X did not improve on pthreads at all, was
+in timed sleeps, where you say "get me this lock, but give up if
+it takes longer than X time".
+
+The way both pthreads and C1X threads do this, is you specify a UTC
+wall clock time you want to sleep until.
+
+The only problem with that is that UTC wall clock time is not
+continuous when implemented on a computer, and it may not even be
+monotonously increasing, since NTPD or other timesync facilites may
+step the clock backwards, particularly in the first minutes after
+boot.
+
+If the practice of saying "get me this lock before 16:00Z" was
+widespread, I could see the point, but I have actually never seen
+that in any source code.  What I have seen are wrappers that take
+the general shape of::
+
+	int
+	get_lock_timed(lock, timeout)
+	{
+		while (timeout > 0) {
+			t0 = time();
+			i = get_lock_before(lock, t + timeout));
+			if (i == WASLOCKED)
+				return (i);
+			t1 = time();
+			timeout -= (t1 - t0);
+		}
+		return (TIMEDOUT);
+	}
+
+Because it's not like the call is actually guaranteed to return at
+16:00Z if you ask it to, you are only promised it will not return
+later than that, so you have to wrap the call in a loop.
+
+Whoever defined the select(2) and poll(2) systemcalls knew better
+than the POSIX and ISO-C group-think:  They specifed a maximum
+duration for the call, because then it doesn't matter what time
+it is, only how long time has transpired.
+
+Ohh, and setting the stack-size for a new thread ?
+That is appearantly "too dangerous" so there is no argument in the
+C1X API for doing so, a clear step backwards from pthreads.
+
+But guess what:  Thread stacks are like T-shirts:  There is no "one
+size fits all."
+
+I have no idea what the "danger" they perceived were, my best
+guess is that feared it might make the API useful ?
+
+This single idiocy will single-handedly doom the C1X thread API
+to uselessness.
+
+Now, don't get me wrong:  There are lot of ways to improve the C
+language that would make sense:  Bitmaps, defined structure packing
+(think: communication protocol packets), big/little endian variables
+(data sharing), sensible handling of linked lists etc.
+
+As ugly as it is, even the printf()/scanf() format strings could
+be improved, by offering a sensible plugin mechanism, which the
+compiler can understand and use to issue warnings.
+
+Heck, even a simple basic object facility would be good addition,
+now that C++ have become this huge bloated monster language.
+
+But none of that is appearantly as important as <stdnoreturn.h>
+and a new, crippled and therefore useless thread API.
+
+The neat thing about the C language, and the one feature that made
+it so popular, is that not even an ISO-C working group can prevent
+you from implementing all these things using macros and other tricks.
+
+But it would be better to have them in the language, so the compiler
+could issue sensible warnings and programmers won't have to write
+monsters like::
+
+    #define VTAILQ_INSERT_BEFORE(listelm, elm, field) do {              \
+        (elm)->field.vtqe_prev = (listelm)->field.vtqe_prev;            \
+        VTAILQ_NEXT((elm), field) = (listelm);                          \
+        *(listelm)->field.vtqe_prev = (elm);                            \
+        (listelm)->field.vtqe_prev = &VTAILQ_NEXT((elm), field);        \
+    } while (0)
+
+To put an element on a linked list.
+
+I could go on like this, but it would rapidly become boring for
+both you and me, because the current C1X draft is 701 pages, and
+it contains not a single explanatory example if how to use any of
+the verbiage in pratice.
+
+Compare this with The C Programming Language, a book of 274 pages
+which in addition to define the C language, taught people how to
+program through well-thought-out examples.
+
+From where I sit, ISO WG14 are destroying the C language I use and love.
+
+Poul-Henning, 2011-12-20



From phk at varnish-cache.org  Tue Dec 20 20:28:56 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 21:28:56 +0100
Subject: [master] 2b6717a typos
Message-ID: <E1Rd6Iy-0006oB-7l@project.varnish-software.com>

commit 2b6717a07db47d14fc232de4d9311a821663addf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 20:28:50 2011 +0000

    typos

diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst
index cff365b..6921926 100644
--- a/doc/sphinx/phk/thetoolsweworkwith.rst
+++ b/doc/sphinx/phk/thetoolsweworkwith.rst
@@ -65,7 +65,7 @@ text actually means:
 	an uppercase letter or another underscore are always reserved
 	for any use.
 
-Feel free to guess.
+Feel free to guess, there's more such on pdf page 200 of the draft.
 
 Next, they broke the upper/lower rule, by adding special keywords
 in mixed case, probably because they thought it looked nicer::
@@ -103,8 +103,8 @@ aspects.
 
 For instance, neither pthreads nor C1X-threads offer a "assert I'm
 holding this mutex locked" facility.  I will posit that you cannot
-successfully develop real-world threaded programs and APIs that,
-or without wasting a lot of time debugging silly mistakes.
+successfully develop real-world threaded programs and APIs without
+that, or without wasting a lot of time debugging silly mistakes.
 
 If you look in the Varnish source code, which uses pthreads, you
 will see that I have wrapped pthread mutexes in my own little



From phk at varnish-cache.org  Tue Dec 20 20:30:33 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 20 Dec 2011 21:30:33 +0100
Subject: [master] 8313da8 Another typo
Message-ID: <E1Rd6KX-0008A4-LE@project.varnish-software.com>

commit 8313da8d5db143038e72157493cd33c95da2e77a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 20 20:30:28 2011 +0000

    Another typo

diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst
index 6921926..2631c73 100644
--- a/doc/sphinx/phk/thetoolsweworkwith.rst
+++ b/doc/sphinx/phk/thetoolsweworkwith.rst
@@ -200,7 +200,7 @@ To put an element on a linked list.
 I could go on like this, but it would rapidly become boring for
 both you and me, because the current C1X draft is 701 pages, and
 it contains not a single explanatory example if how to use any of
-the verbiage in pratice.
+the verbiage in practice.
 
 Compare this with The C Programming Language, a book of 274 pages
 which in addition to define the C language, taught people how to



From phk at varnish-cache.org  Wed Dec 21 19:04:34 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Wed, 21 Dec 2011 20:04:34 +0100
Subject: [master] 676064d Add timeouts and comprehensive test-case for
	memorypool gymnastics.
Message-ID: <E1RdRSs-0008WB-4V@project.varnish-software.com>

commit 676064df3932eb64b2aaa8e526c2cd7d5a45d226
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 21 11:16:23 2011 +0000

    Add timeouts and comprehensive test-case for memorypool gymnastics.

diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index ac4abf2..92e38d2 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -42,14 +42,17 @@ struct memitem {
 #define MEMITEM_MAGIC			0x42e55401
 	VTAILQ_ENTRY(memitem)		list;
 	unsigned			size;
-	double				payload;
+	double				touched;
+	char				payload;
 };
 
+VTAILQ_HEAD(memhead_s, memitem);
+
 struct mempool {
 	unsigned			magic;
 #define MEMPOOL_MAGIC			0x37a75a8d
-	VTAILQ_HEAD(,memitem)		list;
-	VTAILQ_HEAD(,memitem)		surplus;
+	struct memhead_s		list;
+	struct memhead_s		surplus;
 	struct lock			*mtx;
 	struct lock			imtx;
 	const char			*name;
@@ -58,6 +61,7 @@ struct mempool {
 	struct VSC_C_mempool		*vsc;
 	unsigned			n_pool;
 	pthread_t			thread;
+	double				t_now;
 };
 
 /*---------------------------------------------------------------------
@@ -81,21 +85,26 @@ mpl_alloc(const struct mempool *mpl)
 /*---------------------------------------------------------------------
  * Pool-guard
  *   Attempt to keep number of free items in pool inside bounds with
- *   minimum locking activity.
+ *   minimum locking activity, and keep an eye on items at the tail
+ *   of the list not getting too old.
  */
 
+#include <stdio.h>
+
 static void *
 mpl_guard(void *priv)
 {
 	struct mempool *mpl;
 	struct memitem *mi = NULL;
 	double mpl_slp __state_variable__(mpl_slp);
+	double last = 0;
 
 	CAST_OBJ_NOTNULL(mpl, priv, MEMPOOL_MAGIC);
 	mpl_slp = 0.15;	// random
 	while (1) {
 		VTIM_sleep(mpl_slp);
 		mpl_slp = 0.814;	// random
+		mpl->t_now = VTIM_real();
 
 		if (mi != NULL && (mpl->n_pool > mpl->param->max_pool ||
 		    mi->size < *mpl->cur_size)) {
@@ -106,45 +115,69 @@ mpl_guard(void *priv)
 		if (mi == NULL && mpl->n_pool < mpl->param->min_pool)
 			mi = mpl_alloc(mpl);
 
+
 		if (mpl->n_pool < mpl->param->min_pool && mi != NULL) {
 			/* can do */
 		} else if (mpl->n_pool > mpl->param->max_pool && mi == NULL) {
 			/* can do */
 		} else if (!VTAILQ_EMPTY(&mpl->surplus)) {
 			/* can do */
+		} else if (last + .1 * mpl->param->max_age < mpl->t_now) {
+			/* should do */
 		} else {
-			continue;	/* cannot do */
+			continue;	/* nothing to do */
 		}
 
-		mpl_slp = 0.314;
+		mpl_slp = 0.314;	// random
 
 		if (Lck_Trylock(mpl->mtx))
 			continue;
 
-		mpl_slp = .01;
-
 		if (mpl->n_pool < mpl->param->min_pool &&
 		    mi != NULL && mi->size >= *mpl->cur_size) {
 			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 			mpl->vsc->pool++;
 			mpl->n_pool++;
+			mi->touched = mpl->t_now;
 			VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
 			mi = NULL;
+			mpl_slp = .01;	// random
+
 		}
 		if (mpl->n_pool > mpl->param->max_pool && mi == NULL) {
 			mi = VTAILQ_FIRST(&mpl->list);
 			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 			mpl->vsc->pool--;
+			mpl->vsc->surplus++;
 			mpl->n_pool--;
 			VTAILQ_REMOVE(&mpl->list, mi, list);
+			mpl_slp = .01;	// random
 		}
 		if (mi == NULL) {
 			mi = VTAILQ_FIRST(&mpl->surplus);
 			if (mi != NULL) {
 				CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 				VTAILQ_REMOVE(&mpl->surplus, mi, list);
+				mpl_slp = .01;	// random
 			}
 		}
+		if (mi == NULL && mpl->n_pool > mpl->param->min_pool) {
+			mi = VTAILQ_LAST(&mpl->list, memhead_s);
+			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+			if (mi->touched + mpl->param->max_age < mpl->t_now) {
+				mpl->vsc->pool--;
+				mpl->vsc->timeout++;
+				mpl->n_pool--;
+				VTAILQ_REMOVE(&mpl->list, mi, list);
+				mpl_slp = .01;	// random
+			} else {
+				mi = NULL;
+				last = mpl->t_now;
+			}
+		} else if (mpl->n_pool <= mpl->param->min_pool) {
+			last = mpl->t_now;
+		}
+
 		Lck_Unlock(mpl->mtx);
 
 		if (mi != NULL) {
@@ -250,6 +283,7 @@ MPL_Free(struct mempool *mpl, void *item)
 	} else {
 		mpl->vsc->pool++;
 		mpl->n_pool++;
+		mi->touched = mpl->t_now;
 		VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
 	}
 
diff --git a/bin/varnishtest/tests/c00050.vtc b/bin/varnishtest/tests/c00050.vtc
new file mode 100644
index 0000000..340563b
--- /dev/null
+++ b/bin/varnishtest/tests/c00050.vtc
@@ -0,0 +1,29 @@
+varnishtest "Memory pool gymnastics"
+
+server s1 { } -start
+
+varnish v1 -vcl+backend {} -start
+
+delay 1
+
+varnish v1 -expect MEMPOOL.vbc.pool == 10
+
+varnish v1 -cliok "param.set vbc_pool 90,100,100"
+
+delay 1
+
+varnish v1 -expect MEMPOOL.vbc.pool == 90
+
+varnish v1 -cliok "param.set vbc_pool 50,80,100"
+
+delay 1
+
+varnish v1 -expect MEMPOOL.vbc.pool == 80
+varnish v1 -expect MEMPOOL.vbc.surplus == 10
+
+varnish v1 -cliok "param.set vbc_pool 10,80,1"
+
+delay 1
+
+varnish v1 -expect MEMPOOL.vbc.pool == 10
+varnish v1 -expect MEMPOOL.vbc.timeout == 70



From phk at varnish-cache.org  Thu Dec 22 18:42:39 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 19:42:39 +0100
Subject: [master] bc72cff Pave a bit of road for major surgery
Message-ID: <E1RdnbD-0002ft-VV@project.varnish-software.com>

commit bc72cff0f52ed41010a3fe0b0c93eedf84c85ab4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 15:08:13 2011 +0000

    Pave a bit of road for major surgery

diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 54124b2..7431c1b 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -441,21 +441,21 @@ VRT_r_req_xid(struct sess *sp)
 
 /*--------------------------------------------------------------------*/
 
-#define REQ_BOOL(which)						\
+#define REQ_BOOL(hash_var)					\
 void __match_proto__()						\
-VRT_l_req_##which(struct sess *sp, unsigned val)		\
+VRT_l_req_##hash_var(struct sess *sp, unsigned val)		\
 {								\
 								\
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);			\
-	sp->which = val ? 1 : 0;				\
+	sp->hash_var = val ? 1 : 0;				\
 }								\
 								\
 unsigned __match_proto__()					\
-VRT_r_req_##which(struct sess *sp)				\
+VRT_r_req_##hash_var(struct sess *sp)				\
 {								\
 								\
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);			\
-	return(sp->which);					\
+	return(sp->hash_var);					\
 }
 
 REQ_BOOL(hash_ignore_busy)



From phk at varnish-cache.org  Thu Dec 22 18:42:40 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 19:42:40 +0100
Subject: [master] 9a7413d Sort the sess fields in per session and per request
	fields, plus a few I have not made up my mind about yet.
Message-ID: <E1RdnbE-0002fy-0e@project.varnish-software.com>

commit 9a7413d2a7d28333112cb6326e785582373b6684
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 18:41:03 2011 +0000

    Sort the sess fields in per session and per request fields, plus a few
    I have not made up my mind about yet.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 08f8adc..46a0d26 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -581,18 +581,13 @@ struct object {
 struct sess {
 	unsigned		magic;
 #define SESS_MAGIC		0x2c2f9c5a
-	int			fd;
-	unsigned		vsl_id;
-	unsigned		xid;
 
-	int			restarts;
-	int			esi_level;
-	int			disable_esi;
+	struct worker		*wrk;
 
-	uint8_t			hash_ignore_busy;
-	uint8_t			hash_always_miss;
+	/* Session related fields ------------------------------------*/
 
-	struct worker		*wrk;
+	int			fd;
+	unsigned		vsl_id;
 
 	socklen_t		sockaddrlen;
 	socklen_t		mysockaddrlen;
@@ -605,6 +600,29 @@ struct sess {
 	char			port[PORT_BUFSIZE];
 	char			*client_identity;
 
+	/* Various internal stuff */
+	struct sessmem		*mem;
+
+	VTAILQ_ENTRY(sess)	poollist;
+	struct acct		acct_ses;
+
+	VTAILQ_ENTRY(sess)	list;
+
+#if defined(HAVE_EPOLL_CTL)
+	struct epoll_event ev;
+#endif
+
+	/* Request related fields ------------------------------------*/
+
+	unsigned		xid;
+
+	int			restarts;
+	int			esi_level;
+	int			disable_esi;
+
+	uint8_t			hash_ignore_busy;
+	uint8_t			hash_always_miss;
+
 	/* HTTP request */
 	const char		*doclose;
 	struct http		*http;
@@ -620,14 +638,6 @@ struct sess {
 	uint8_t			*vary_l;
 	uint8_t			*vary_e;
 
-	struct http_conn	htc[1];
-
-	/* Timestamps, all on TIM_real() timescale */
-	double			t_open;
-	double			t_req;
-	double			t_resp;
-	double			t_end;
-
 	/* Acceptable grace period */
 	struct exp		exp;
 
@@ -639,24 +649,24 @@ struct sess {
 	uint16_t		err_code;
 	const char		*err_reason;
 
-	VTAILQ_ENTRY(sess)	list;
+	/* The busy objhead we sleep on */
+	struct objhead		*hash_objhead;
 
 	struct director		*director;
 	struct VCL_conf		*vcl;
 
-	/* The busy objhead we sleep on */
-	struct objhead		*hash_objhead;
+	uint64_t		req_bodybytes;
 
-	/* Various internal stuff */
-	struct sessmem		*mem;
+	/* TBD fields ------------------------------------------------*/
 
-	VTAILQ_ENTRY(sess)	poollist;
-	uint64_t		req_bodybytes;
-	struct acct		acct_ses;
+	struct http_conn	htc[1];
+
+	/* Timestamps, all on TIM_real() timescale */
+	double			t_open;
+	double			t_req;
+	double			t_resp;
+	double			t_end;
 
-#if defined(HAVE_EPOLL_CTL)
-	struct epoll_event ev;
-#endif
 };
 
 /* Prototypes etc ----------------------------------------------------*/



From phk at varnish-cache.org  Thu Dec 22 19:29:12 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 20:29:12 +0100
Subject: [master] 159c511 Further mempool-polishing:
Message-ID: <E1RdoKG-0005f1-Bm@project.varnish-software.com>

commit 159c511d774bed9cc1b6774941640a75b4418931
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 19:26:46 2011 +0000

    Further mempool-polishing:
    
    Drop the mtx arg to MPL_New(), it wouldn't help.
    
    Store the pool name locally.
    
    Fix wrong type on some stats counters.
    
    Copy gauge counters from reliable values.
    
    Add stats-counter for dry pool allocations.
    
    Add MPL_Destroy() which tickles the guard thread into self-destroying
    the pool.  Only allowed if no live objects.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 46a0d26..d3b34b7 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -871,8 +871,9 @@ int Lck_CondWait(pthread_cond_t *cond, struct lock *lck, struct timespec *ts);
 #undef LOCK
 
 /* cache_mempool.c */
-struct mempool * MPL_New(const char *name, struct lock *mtx,
-    volatile struct poolparam *pp, volatile unsigned *cur_size);
+struct mempool * MPL_New(const char *name, volatile struct poolparam *pp,
+    volatile unsigned *cur_size);
+void MPL_Destroy(struct mempool **mpp);
 void *MPL_Get(struct mempool *mpl, unsigned *size);
 void MPL_Free(struct mempool *mpl, void *item);
 
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 6cfcaf3..48c01a3 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -518,6 +518,6 @@ void
 VDI_Init(void)
 {
 
-	vbcpool = MPL_New("vbc", NULL, &cache_param->vbc_pool, &vbcps);
+	vbcpool = MPL_New("vbc", &cache_param->vbc_pool, &vbcps);
 	AN(vbcpool);
 }
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 92e38d2..a89f1e7 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -51,17 +51,18 @@ VTAILQ_HEAD(memhead_s, memitem);
 struct mempool {
 	unsigned			magic;
 #define MEMPOOL_MAGIC			0x37a75a8d
+	char				name[8];
 	struct memhead_s		list;
 	struct memhead_s		surplus;
-	struct lock			*mtx;
-	struct lock			imtx;
-	const char			*name;
+	struct lock			mtx;
 	volatile struct poolparam	*param;
 	volatile unsigned		*cur_size;
+	uint64_t			live;
 	struct VSC_C_mempool		*vsc;
 	unsigned			n_pool;
 	pthread_t			thread;
 	double				t_now;
+	int				self_destruct;
 };
 
 /*---------------------------------------------------------------------
@@ -124,20 +125,50 @@ mpl_guard(void *priv)
 			/* can do */
 		} else if (last + .1 * mpl->param->max_age < mpl->t_now) {
 			/* should do */
+		} else if (mpl->self_destruct) {
+			/* can do */
 		} else {
 			continue;	/* nothing to do */
 		}
 
 		mpl_slp = 0.314;	// random
 
-		if (Lck_Trylock(mpl->mtx))
+		if (Lck_Trylock(&mpl->mtx))
 			continue;
 
+		if (mpl->self_destruct) {
+			AZ(mpl->live);
+			while (1) {
+				if (mi == NULL) {
+					mi = VTAILQ_FIRST(&mpl->list);
+					if (mi != NULL) {
+						mpl->vsc->pool = --mpl->n_pool;
+						VTAILQ_REMOVE(&mpl->list,
+						    mi, list);
+					}
+				}
+				if (mi == NULL) {
+					mi = VTAILQ_FIRST(&mpl->surplus);
+					if (mi != NULL)
+						VTAILQ_REMOVE(&mpl->surplus,
+						    mi, list);
+				}
+				if (mi == NULL) 
+					break;
+				FREE_OBJ(mi);
+				mi = NULL;
+			}
+			VSM_Free(mpl->vsc);
+			Lck_Unlock(&mpl->mtx);
+			Lck_Delete(&mpl->mtx);
+			FREE_OBJ(mpl);
+			break;
+		}
+
 		if (mpl->n_pool < mpl->param->min_pool &&
 		    mi != NULL && mi->size >= *mpl->cur_size) {
 			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
-			mpl->vsc->pool++;
-			mpl->n_pool++;
+			mpl->vsc->pool = ++mpl->n_pool;
 			mi->touched = mpl->t_now;
 			VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
 			mi = NULL;
@@ -147,9 +178,8 @@ mpl_guard(void *priv)
 		if (mpl->n_pool > mpl->param->max_pool && mi == NULL) {
 			mi = VTAILQ_FIRST(&mpl->list);
 			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
-			mpl->vsc->pool--;
+			mpl->vsc->pool = --mpl->n_pool;
 			mpl->vsc->surplus++;
-			mpl->n_pool--;
 			VTAILQ_REMOVE(&mpl->list, mi, list);
 			mpl_slp = .01;	// random
 		}
@@ -165,9 +195,8 @@ mpl_guard(void *priv)
 			mi = VTAILQ_LAST(&mpl->list, memhead_s);
 			CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 			if (mi->touched + mpl->param->max_age < mpl->t_now) {
-				mpl->vsc->pool--;
+				mpl->vsc->pool = --mpl->n_pool;
 				mpl->vsc->timeout++;
-				mpl->n_pool--;
 				VTAILQ_REMOVE(&mpl->list, mi, list);
 				mpl_slp = .01;	// random
 			} else {
@@ -178,22 +207,22 @@ mpl_guard(void *priv)
 			last = mpl->t_now;
 		}
 
-		Lck_Unlock(mpl->mtx);
+		Lck_Unlock(&mpl->mtx);
 
 		if (mi != NULL) {
 			FREE_OBJ(mi);
 			mi = NULL;
 		}
 	}
-	NEEDLESS_RETURN(NULL);
+	return (NULL);
 }
 
 /*---------------------------------------------------------------------
+ * Create a new memory pool, and start the guard thread for it.
  */
 
 struct mempool *
 MPL_New(const char *name,
-	struct lock *mtx,
 	volatile struct poolparam *pp,
 	volatile unsigned *cur_size)
 {
@@ -201,23 +230,44 @@ MPL_New(const char *name,
 
 	ALLOC_OBJ(mpl, MEMPOOL_MAGIC);
 	AN(mpl);
-	mpl->name = name;
+	bprintf(mpl->name, "%s", name);
 	mpl->param = pp;
 	mpl->cur_size = cur_size;
-	mpl->mtx = mtx;
 	VTAILQ_INIT(&mpl->list);
 	VTAILQ_INIT(&mpl->surplus);
-	Lck_New(&mpl->imtx, lck_mempool);
-	if (mpl->mtx == NULL)
-		mpl->mtx = &mpl->imtx;
+	Lck_New(&mpl->mtx, lck_mempool);
 	/* XXX: prealloc min_pool */
 	mpl->vsc = VSM_Alloc(sizeof *mpl->vsc,
-	    VSC_CLASS, VSC_TYPE_MEMPOOL, name);
+	    VSC_CLASS, VSC_TYPE_MEMPOOL, mpl->name);
 	AN(mpl->vsc);
 	AZ(pthread_create(&mpl->thread, NULL, mpl_guard, mpl));
+	AZ(pthread_detach(mpl->thread));
 	return (mpl);
 }
 
+/*---------------------------------------------------------------------
+ * Destroy a memory pool.  There must be no live items, and we cheat
+ * and leave all the hard work to the guard thread.
+ */
+
+void
+MPL_Destroy(struct mempool **mpp)
+{
+	struct mempool *mpl;
+
+	AN(mpp);
+	mpl = *mpp;
+	*mpp = NULL;
+	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	Lck_Lock(&mpl->mtx);
+	AZ(mpl->live);
+	mpl->self_destruct = 1;
+	Lck_Unlock(&mpl->mtx);
+}
+
+/*---------------------------------------------------------------------
+ */
+
 void *
 MPL_Get(struct mempool *mpl, unsigned *size)
 {
@@ -225,17 +275,18 @@ MPL_Get(struct mempool *mpl, unsigned *size)
 
 	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
 
-	Lck_Lock(mpl->mtx);
+	Lck_Lock(&mpl->mtx);
 
 	mpl->vsc->allocs++;
-	mpl->vsc->live++;
+	mpl->vsc->live = ++mpl->live;
 
 	do {
 		mi = VTAILQ_FIRST(&mpl->list);
-		if (mi == NULL)
+		if (mi == NULL) {
+			mpl->vsc->randry++;
 			break;
-		mpl->vsc->pool--;
-		mpl->n_pool--;
+		}
+		mpl->vsc->pool = --mpl->n_pool;
 		CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 		VTAILQ_REMOVE(&mpl->list, mi, list);
 		if (mi->size < *mpl->cur_size) {
@@ -247,7 +298,7 @@ MPL_Get(struct mempool *mpl, unsigned *size)
 		}
 	} while (mi == NULL);
 
-	Lck_Unlock(mpl->mtx);
+	Lck_Unlock(&mpl->mtx);
 
 	if (mi == NULL)
 		mi = mpl_alloc(mpl);
@@ -269,10 +320,10 @@ MPL_Free(struct mempool *mpl, void *item)
 	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 	memset(item, 0, mi->size);
 
-	Lck_Lock(mpl->mtx);
+	Lck_Lock(&mpl->mtx);
 
 	mpl->vsc->frees++;
-	mpl->vsc->live--;
+	mpl->vsc->live = --mpl->live;
 
 	if (mi->size < *mpl->cur_size) {
 		mpl->vsc->toosmall++;
@@ -281,11 +332,10 @@ MPL_Free(struct mempool *mpl, void *item)
 		mpl->vsc->surplus++;
 		VTAILQ_INSERT_HEAD(&mpl->surplus, mi, list);
 	} else {
-		mpl->vsc->pool++;
-		mpl->n_pool++;
+		mpl->vsc->pool = ++mpl->n_pool;
 		mi->touched = mpl->t_now;
 		VTAILQ_INSERT_HEAD(&mpl->list, mi, list);
 	}
 
-	Lck_Unlock(mpl->mtx);
+	Lck_Unlock(&mpl->mtx);
 }
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 2671558..3d1e30a 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -109,13 +109,14 @@ VSC_F(happy,		uint64_t, 0, 'b', "Happy health probes", "")
 /**********************************************************************/
 #ifdef VSC_DO_MEMPOOL
 
-VSC_F(allocs,			uint64_t, 0, 'c', "Allocations", "")
-VSC_F(frees,			uint64_t, 0, 'c', "Frees", "")
 VSC_F(live,			uint64_t, 0, 'g', "In use", "")
 VSC_F(pool,			uint64_t, 0, 'g', "In Pool", "")
-VSC_F(recycle,			uint64_t, 0, 'g', "Recycled from pool", "")
-VSC_F(timeout,			uint64_t, 0, 'g', "Timed out from pool", "")
-VSC_F(toosmall,			uint64_t, 0, 'g', "Too small to recycle", "")
-VSC_F(surplus,			uint64_t, 0, 'g', "Too many for pool", "")
+VSC_F(allocs,			uint64_t, 0, 'c', "Allocations", "")
+VSC_F(frees,			uint64_t, 0, 'c', "Frees", "")
+VSC_F(recycle,			uint64_t, 0, 'c', "Recycled from pool", "")
+VSC_F(timeout,			uint64_t, 0, 'c', "Timed out from pool", "")
+VSC_F(toosmall,			uint64_t, 0, 'c', "Too small to recycle", "")
+VSC_F(surplus,			uint64_t, 0, 'c', "Too many for pool", "")
+VSC_F(randry,			uint64_t, 0, 'c', "Pool ran dry", "")
 
 #endif



From phk at varnish-cache.org  Thu Dec 22 20:51:03 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 21:51:03 +0100
Subject: [master] 23b1f97 Add an empty struct req,
	and start managing it with a mempool per worker pool.
Message-ID: <E1RdpbT-0002IN-2K@project.varnish-software.com>

commit 23b1f97765ba6dc44c688187747c77b772f966c7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 20:46:12 2011 +0000

    Add an empty struct req, and start managing it with a mempool per
    worker pool.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index d3b34b7..bcf4f54 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -576,13 +576,24 @@ struct object {
 
 };
 
-/* -------------------------------------------------------------------*/
+/*--------------------------------------------------------------------*/
+
+struct req {
+	unsigned		magic;
+#define REQ_MAGIC		0x2751aaa1
+};
+
+/*--------------------------------------------------------------------*/
 
 struct sess {
 	unsigned		magic;
 #define SESS_MAGIC		0x2c2f9c5a
 
+	/* Cross references ------------------------------------------*/
+
 	struct worker		*wrk;
+	struct req		*req;
+	struct sessmem		*mem;
 
 	/* Session related fields ------------------------------------*/
 
@@ -600,9 +611,6 @@ struct sess {
 	char			port[PORT_BUFSIZE];
 	char			*client_identity;
 
-	/* Various internal stuff */
-	struct sessmem		*mem;
-
 	VTAILQ_ENTRY(sess)	poollist;
 	struct acct		acct_ses;
 
@@ -871,6 +879,7 @@ int Lck_CondWait(pthread_cond_t *cond, struct lock *lck, struct timespec *ts);
 #undef LOCK
 
 /* cache_mempool.c */
+void MPL_AssertSane(void *item);
 struct mempool * MPL_New(const char *name, volatile struct poolparam *pp,
     volatile unsigned *cur_size);
 void MPL_Destroy(struct mempool **mpp);
@@ -908,7 +917,7 @@ struct sess *SES_Alloc(void);
 void SES_Close(struct sess *sp, const char *reason);
 void SES_Delete(struct sess *sp, const char *reason);
 void SES_Charge(struct sess *sp);
-struct sesspool *SES_NewPool(struct pool *pp);
+struct sesspool *SES_NewPool(struct pool *pp, unsigned pool_no);
 void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
 int SES_Schedule(struct sess *sp);
 void SES_Handle(struct sess *sp, int status);
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index a9b8c0b..87e51a9 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -282,7 +282,6 @@ VCA_SetupSess(struct worker *w)
 	assert(wa->acceptaddrlen <= sp->sockaddrlen);
 	memcpy(&sp->sockaddr, &wa->acceptaddr, wa->acceptaddrlen);
 	sp->sockaddrlen = wa->acceptaddrlen;
-	sp->step = STP_FIRST;
 	vca_pace_good();
 	w->stats.sess_conn++;
 	vca_prep(sp);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index e7c7fe2..333db31 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1665,6 +1665,8 @@ CNT_Session(struct sess *sp)
 	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
+	MPL_AssertSane(sp->req);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
@@ -1702,6 +1704,8 @@ CNT_Session(struct sess *sp)
 	 */
 	for (done = 0; !done; ) {
 		assert(sp->wrk == wrk);
+		CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
+		MPL_AssertSane(sp->req);
 		/*
 		 * This is a good place to be paranoid about the various
 		 * pointers still pointing to the things we expect.
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index a89f1e7..6f556f2 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -153,7 +153,7 @@ mpl_guard(void *priv)
 						VTAILQ_REMOVE(&mpl->surplus,
 						    mi, list);
 				}
-				if (mi == NULL) 
+				if (mi == NULL)
 					break;
 				FREE_OBJ(mi);
 				mi = NULL;
@@ -305,6 +305,7 @@ MPL_Get(struct mempool *mpl, unsigned *size)
 	if (size != NULL)
 		*size = mi->size;
 
+	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
 	/* Throw away sizeof info for FlexeLint: */
 	return ((void*)(uintptr_t)&mi->payload);
 }
@@ -315,6 +316,7 @@ MPL_Free(struct mempool *mpl, void *item)
 	struct memitem *mi;
 
 	CHECK_OBJ_NOTNULL(mpl, MEMPOOL_MAGIC);
+	AN(item);
 
 	mi = (void*)((uintptr_t)item - offsetof(struct memitem, payload));
 	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
@@ -339,3 +341,11 @@ MPL_Free(struct mempool *mpl, void *item)
 
 	Lck_Unlock(&mpl->mtx);
 }
+
+void
+MPL_AssertSane(void *item)
+{
+	struct memitem *mi;
+	mi = (void*)((uintptr_t)item - offsetof(struct memitem, payload));
+	CHECK_OBJ_NOTNULL(mi, MEMITEM_MAGIC);
+}
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index c557edd..ee71572 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -244,6 +244,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 				w->do_what = pool_do_nothing;
 			} else {
 				VCA_SetupSess(w);
+				w->sp->step = STP_FIRST;
 				w->do_what = pool_do_sess;
 			}
 			WS_Release(w->ws, 0);
@@ -490,7 +491,7 @@ pool_herder(void *priv)
  */
 
 static struct pool *
-pool_mkpool(void)
+pool_mkpool(unsigned pool_no)
 {
 	struct pool *pp;
 	struct listen_sock *ls;
@@ -504,7 +505,7 @@ pool_mkpool(void)
 	VTAILQ_INIT(&pp->queue);
 	VTAILQ_INIT(&pp->idle);
 	VTAILQ_INIT(&pp->socks);
-	pp->sesspool = SES_NewPool(pp);
+	pp->sesspool = SES_NewPool(pp, pool_no);
 	AN(pp->sesspool);
 
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
@@ -545,7 +546,7 @@ pool_poolherder(void *priv)
 	nwq = 0;
 	while (1) {
 		if (nwq < cache_param->wthread_pools) {
-			pp = pool_mkpool();
+			pp = pool_mkpool(nwq);
 			if (pp != NULL) {
 				VTAILQ_INSERT_TAIL(&pools, pp, list);
 				VSC_C_main->pools++;
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 65dd5c7..790ea2c 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "cache.h"
@@ -67,6 +68,8 @@ struct sesspool {
 	struct lock		mtx;
 	unsigned		nsess;
 	unsigned		dly_free_cnt;
+	unsigned		req_size;
+	struct mempool		*mpl_req;
 };
 
 /*--------------------------------------------------------------------
@@ -214,6 +217,9 @@ SES_New(struct worker *wrk, struct sesspool *pp)
 	if (sm == NULL)
 		return (NULL);
 	sp = &sm->sess;
+	sp->req = MPL_Get(pp->mpl_req, NULL);
+	AN(sp->req);
+	sp->req->magic = REQ_MAGIC;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	return (sp);
 }
@@ -233,6 +239,7 @@ SES_Alloc(void)
 	ses_setup(sm);
 	sp = &sm->sess;
 	sp->sockaddrlen = 0;
+	/* XXX: sp->req ? */
 	return (sp);
 }
 
@@ -326,6 +333,8 @@ SES_Delete(struct sess *sp, const char *reason)
 
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
+	MPL_AssertSane(sp->req);
 	sm = sp->mem;
 	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
 	pp = sm->pool;
@@ -353,6 +362,11 @@ SES_Delete(struct sess *sp, const char *reason)
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
 
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
+	MPL_AssertSane(sp->req);
+	MPL_Free(pp->mpl_req, sp->req);
+	sp->req = NULL;
+
 	if (sm->workspace != cache_param->sess_workspace ||
 	    sm->nhttp != (uint16_t)cache_param->http_max_hdr ||
 	    pp->nsess > cache_param->max_sess) {
@@ -382,15 +396,19 @@ SES_Delete(struct sess *sp, const char *reason)
  */
 
 struct sesspool *
-SES_NewPool(struct pool *pp)
+SES_NewPool(struct pool *pp, unsigned pool_no)
 {
 	struct sesspool *sp;
+	char nb[8];
 
 	ALLOC_OBJ(sp, SESSPOOL_MAGIC);
 	AN(sp);
 	sp->pool = pp;
 	VTAILQ_INIT(&sp->freelist);
 	Lck_New(&sp->mtx, lck_sessmem);
+	bprintf(nb, "req%u", pool_no);
+	sp->req_size = sizeof (struct req);
+	sp->mpl_req = MPL_New(nb, &cache_param->req_pool, &sp->req_size);
 	return (sp);
 }
 
@@ -413,5 +431,6 @@ SES_DeletePool(struct sesspool *sp, struct worker *wrk)
 	AZ(sp->nsess);
 	Lck_Unlock(&sp->mtx);
 	Lck_Delete(&sp->mtx);
+	MPL_Destroy(&sp->mpl_req);
 	FREE_OBJ(sp);
 }
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index 8198a78..a024452 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -202,4 +202,5 @@ struct params {
 	ssize_t			vsl_space;
 
 	struct poolparam	vbc_pool;
+	struct poolparam	req_pool;
 };
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index f7f1dd0..c236323 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1197,7 +1197,7 @@ static const struct parspec input_parspec[] = {
 		0,
 		"true", ""},
 
-	{ "vbc_pool", tweak_poolparam, &mgt_param.vbc_pool, 0, 10000,
+	{ "pool_vbc", tweak_poolparam, &mgt_param.vbc_pool, 0, 10000,
 		"Parameters for backend connection memory pool.\n"
 		"The three numbers are:\n"
 		"   min_pool -- minimum size of free pool.\n"
@@ -1206,6 +1206,15 @@ static const struct parspec input_parspec[] = {
 		0,
 		"10,100,10", ""},
 
+	{ "pool_req", tweak_poolparam, &mgt_param.req_pool, 0, 10000,
+		"Parameters for per worker pool request memory pool.\n"
+		"The three numbers are:\n"
+		"   min_pool -- minimum size of free pool.\n"
+		"   max_pool -- maximum size of free pool.\n"
+		"   max_age -- max age of free element.\n",
+		0,
+		"10,100,10", ""},
+
 	{ NULL, NULL, NULL }
 };
 
diff --git a/bin/varnishtest/tests/b00034.vtc b/bin/varnishtest/tests/b00034.vtc
index 3579fcb..8e23d60 100644
--- a/bin/varnishtest/tests/b00034.vtc
+++ b/bin/varnishtest/tests/b00034.vtc
@@ -5,9 +5,9 @@ server s1 {
 
 varnish v1 -vcl+backend {}
 
-varnish v1 -cliok "param.set vbc_pool 1,10,1"
-varnish v1 -clierr 106 "param.set vbc_pool 10"
-varnish v1 -clierr 106 "param.set vbc_pool 10,1,1"
-varnish v1 -clierr 106 "param.set vbc_pool a,10,10"
-varnish v1 -clierr 106 "param.set vbc_pool 10,a,10"
-varnish v1 -clierr 106 "param.set vbc_pool 10,10,a"
+varnish v1 -cliok "param.set pool_vbc 1,10,1"
+varnish v1 -clierr 106 "param.set pool_vbc 10"
+varnish v1 -clierr 106 "param.set pool_vbc 10,1,1"
+varnish v1 -clierr 106 "param.set pool_vbc a,10,10"
+varnish v1 -clierr 106 "param.set pool_vbc 10,a,10"
+varnish v1 -clierr 106 "param.set pool_vbc 10,10,a"
diff --git a/bin/varnishtest/tests/c00050.vtc b/bin/varnishtest/tests/c00050.vtc
index 340563b..04d8f2c 100644
--- a/bin/varnishtest/tests/c00050.vtc
+++ b/bin/varnishtest/tests/c00050.vtc
@@ -8,20 +8,20 @@ delay 1
 
 varnish v1 -expect MEMPOOL.vbc.pool == 10
 
-varnish v1 -cliok "param.set vbc_pool 90,100,100"
+varnish v1 -cliok "param.set pool_vbc 90,100,100"
 
 delay 1
 
 varnish v1 -expect MEMPOOL.vbc.pool == 90
 
-varnish v1 -cliok "param.set vbc_pool 50,80,100"
+varnish v1 -cliok "param.set pool_vbc 50,80,100"
 
 delay 1
 
 varnish v1 -expect MEMPOOL.vbc.pool == 80
 varnish v1 -expect MEMPOOL.vbc.surplus == 10
 
-varnish v1 -cliok "param.set vbc_pool 10,80,1"
+varnish v1 -cliok "param.set pool_vbc 10,80,1"
 
 delay 1
 



From phk at varnish-cache.org  Thu Dec 22 21:07:45 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 22:07:45 +0100
Subject: [master] a5708d5 Minor reorg of kqueue waiter for improved clarity
Message-ID: <E1Rdprd-0003lG-4Y@project.varnish-software.com>

commit a5708d520d9e452880aa5a58f8c1065c8061e489
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 21:07:24 2011 +0000

    Minor reorg of kqueue waiter for improved clarity

diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index e9ec1ec..7dcf7f5 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -86,30 +86,41 @@ vwk_kq_sess(struct vwk *vwk, struct sess *sp, short arm)
 		vwk_kq_flush(vwk);
 }
 
+/*--------------------------------------------------------------------*/
+
 static void
-vwk_kev(struct vwk *vwk, const struct kevent *kp)
+vwk_pipe_ev(struct vwk *vwk, const struct kevent *kp)
 {
 	int i, j;
-	struct sess *sp;
 	struct sess *ss[NKEV];
 
 	AN(kp->udata);
-	if (kp->udata == vwk->pipes) {
-		j = 0;
-		i = read(vwk->pipes[0], ss, sizeof ss);
-		if (i == -1 && errno == EAGAIN)
-			return;
-		while (i >= sizeof ss[0]) {
-			CHECK_OBJ_NOTNULL(ss[j], SESS_MAGIC);
-			assert(ss[j]->fd >= 0);
-			VTAILQ_INSERT_TAIL(&vwk->sesshead, ss[j], list);
-			vwk_kq_sess(vwk, ss[j], EV_ADD | EV_ONESHOT);
-			j++;
-			i -= sizeof ss[0];
-		}
-		assert(i == 0);
+	assert(kp->udata == vwk->pipes);
+	j = 0;
+	i = read(vwk->pipes[0], ss, sizeof ss);
+	if (i == -1 && errno == EAGAIN)
 		return;
+	while (i >= sizeof ss[0]) {
+		CHECK_OBJ_NOTNULL(ss[j], SESS_MAGIC);
+		assert(ss[j]->fd >= 0);
+		VTAILQ_INSERT_TAIL(&vwk->sesshead, ss[j], list);
+		vwk_kq_sess(vwk, ss[j], EV_ADD | EV_ONESHOT);
+		j++;
+		i -= sizeof ss[0];
 	}
+	assert(i == 0);
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
+vwk_sess_ev(struct vwk *vwk, const struct kevent *kp)
+{
+	int i;
+	struct sess *sp;
+
+	AN(kp->udata);
+	assert(kp->udata != vwk->pipes);
 	CAST_OBJ_NOTNULL(sp, kp->udata, SESS_MAGIC);
 	DSL(0x04, SLT_Debug, sp->vsl_id, "KQ: sp %p kev data %lu flags 0x%x%s",
 	    sp, (unsigned long)kp->data, kp->flags,
@@ -171,10 +182,13 @@ vwk_thread(void *priv)
 		for (kp = ke, j = 0; j < n; j++, kp++) {
 			if (kp->filter == EVFILT_TIMER) {
 				dotimer = 1;
-				continue;
+			} else if (kp->filter == EVFILT_READ &&
+			    kp->udata == vwk->pipes) {
+				vwk_pipe_ev(vwk, kp);
+			} else {
+				assert(kp->filter == EVFILT_READ);
+				vwk_sess_ev(vwk, kp);
 			}
-			assert(kp->filter == EVFILT_READ);
-			vwk_kev(vwk, kp);
 		}
 		if (!dotimer)
 			continue;



From phk at varnish-cache.org  Thu Dec 22 21:39:46 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 22:39:46 +0100
Subject: [master] 3d186d9 Relieve waiters of the task of receiving the request
	header,
	instead throw the session at a worker thread the moment it becomes
	readable.
Message-ID: <E1RdqMc-0005W1-IM@project.varnish-software.com>

commit 3d186d949c28d7a5cef6a0b82eb9a22df21bad62
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 21:38:58 2011 +0000

    Relieve waiters of the task of receiving the request header, instead
    throw the session at a worker thread the moment it becomes readable.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index bcf4f54..58419bc 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -920,8 +920,7 @@ void SES_Charge(struct sess *sp);
 struct sesspool *SES_NewPool(struct pool *pp, unsigned pool_no);
 void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
 int SES_Schedule(struct sess *sp);
-void SES_Handle(struct sess *sp, int status);
-
+void SES_Handle(struct sess *sp);
 
 /* cache_shmlog.c */
 extern struct VSC_C_main *VSC_C_main;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 333db31..1d92ded 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1675,7 +1675,7 @@ CNT_Session(struct sess *sp)
 	 */
 	assert(
 	    sp->step == STP_FIRST ||
-	    sp->step == STP_START ||
+	    sp->step == STP_WAIT ||
 	    sp->step == STP_LOOKUP ||
 	    sp->step == STP_RECV);
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 790ea2c..9c5e82b 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -279,23 +279,11 @@ SES_Schedule(struct sess *sp)
  */
 
 void
-SES_Handle(struct sess *sp, int status)
+SES_Handle(struct sess *sp)
 {
 
-	switch (status) {
-	case -2:
-		SES_Delete(sp, "blast");
-		break;
-	case -1:
-		SES_Delete(sp, "no request");
-		break;
-	case 1:
-		sp->step = STP_START;
-		(void)SES_Schedule(sp);
-		break;
-	default:
-		WRONG("Unexpected return from HTC_Rx()");
-	}
+	sp->step = STP_WAIT;
+	(void)SES_Schedule(sp);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index ca0d29f..e71633a 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -129,13 +129,8 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep)
 	} else {
 		CAST_OBJ_NOTNULL(sp, ep->data.ptr, SESS_MAGIC);
 		if (ep->events & EPOLLIN || ep->events & EPOLLPRI) {
-			i = HTC_Rx(sp->htc);
-			if (i == 0) {
-				vwe_modadd(vwe, sp->fd, sp, EPOLL_CTL_MOD);
-				return;	/* more needed */
-			}
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Handle(sp, i);
+			SES_Handle(sp);
 		} else if (ep->events & EPOLLERR) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
 			SES_Delete(sp, "ERR");
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 7dcf7f5..e11f945 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -116,7 +116,6 @@ vwk_pipe_ev(struct vwk *vwk, const struct kevent *kp)
 static void
 vwk_sess_ev(struct vwk *vwk, const struct kevent *kp)
 {
-	int i;
 	struct sess *sp;
 
 	AN(kp->udata);
@@ -129,13 +128,8 @@ vwk_sess_ev(struct vwk *vwk, const struct kevent *kp)
 	assert((sp->vsl_id & VSL_IDENTMASK) == kp->ident);
 	assert((sp->vsl_id & VSL_IDENTMASK) == sp->fd);
 	if (kp->data > 0) {
-		i = HTC_Rx(sp->htc);
-		if (i == 0) {
-			vwk_kq_sess(vwk, sp, EV_ADD | EV_ONESHOT);
-			return;	/* more needed */
-		}
 		VTAILQ_REMOVE(&vwk->sesshead, sp, list);
-		SES_Handle(sp, i);
+		SES_Handle(sp);
 		return;
 	} else if (kp->flags & EV_EOF) {
 		VTAILQ_REMOVE(&vwk->sesshead, sp, list);
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 681b48d..cf750ad 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -153,20 +153,10 @@ vwp_main(void *priv)
 			assert(vwp->pollfd[fd].fd == fd);
 			if (vwp->pollfd[fd].revents) {
 				v2--;
-				i = HTC_Rx(sp->htc);
-				if (vwp->pollfd[fd].revents != POLLIN)
-					VSL(SLT_Debug, fd, "Poll: %x / %d",
-					    vwp->pollfd[fd].revents, i);
 				vwp->pollfd[fd].revents = 0;
 				VTAILQ_REMOVE(&vwp->sesshead, sp, list);
-				if (i == 0) {
-					/* Mov to front of list for speed */
-					VTAILQ_INSERT_HEAD(&vwp->sesshead,
-					    sp, list);
-				} else {
-					vwp_unpoll(vwp, fd);
-					SES_Handle(sp, i);
-				}
+				vwp_unpoll(vwp, fd);
+				SES_Handle(sp);
 			} else if (sp->t_open <= deadline) {
 				VTAILQ_REMOVE(&vwp->sesshead, sp, list);
 				vwp_unpoll(vwp, fd);
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 7717196..09db406 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -90,13 +90,6 @@ vws_port_ev(struct vws *vws, port_event_t *ev) {
 			SES_Delete(sp, "EOF");
 			return;
 		}
-		i = HTC_Rx(sp->htc);
-
-		if (i == 0) {
-			/* incomplete header, wait for more data */
-			vws_add(vws, sp->fd, sp);
-			return;
-		}
 
 		/*
 		 * note: the original man page for port_associate(3C) states:
@@ -115,7 +108,7 @@ vws_port_ev(struct vws *vws, port_event_t *ev) {
 		VTAILQ_REMOVE(&vws->sesshead, sp, list);
 
 		/* SES_Handle will also handle errors */
-		SES_Handle(sp, i);
+		SES_Handle(sp);
 	}
 	return;
 }



From phk at varnish-cache.org  Thu Dec 22 21:51:55 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 22:51:55 +0100
Subject: [master] a87ec7a Shift some code to more appropriate location
Message-ID: <E1RdqYN-0006OJ-KX@project.varnish-software.com>

commit a87ec7adb127158fc70635ab3fb61ddc9180e426
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 21:51:36 2011 +0000

    Shift some code to more appropriate location

diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index ee71572..1a67548 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -331,28 +331,10 @@ pool_queue(struct pool *pp, struct sess *sp)
 int
 Pool_Schedule(struct pool *pp, struct sess *sp)
 {
+
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	AZ(sp->wrk);
-	if (pool_queue(pp, sp) == 0)
-		return(0);
-
-	VSC_C_main->client_drop_late++;
-
-	/*
-	 * Couldn't queue it -- kill it.
-	 *
-	 * XXX: a notice might be polite, but would potentially
-	 * XXX: sleep whichever thread got us here
-	 */
-	sp->t_end = VTIM_real();
-	if (sp->vcl != NULL) {
-		/*
-		 * A session parked on a busy object can come here
-		 * after it wakes up.  Loose the VCL reference.
-		 */
-		VCL_Rel(&sp->vcl);
-	}
-	return (1);
+	return(pool_queue(pp, sp));
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 9c5e82b..1b1f87c 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -42,6 +42,7 @@
 #include "cache.h"
 
 #include "waiter/waiter.h"
+#include "vtim.h"
 
 /*--------------------------------------------------------------------*/
 
@@ -266,6 +267,15 @@ SES_Schedule(struct sess *sp)
 	AN(pp->pool);
 
 	if (Pool_Schedule(pp->pool, sp)) {
+		VSC_C_main->client_drop_late++;
+		sp->t_end = VTIM_real();
+		if (sp->vcl != NULL) {
+			/*
+			 * A session parked on a busy object can come here
+			 * after it wakes up.  Loose the VCL reference.
+			 */
+			VCL_Rel(&sp->vcl);
+		}
 		SES_Delete(sp, "dropped");
 		return (1);
 	}



From phk at varnish-cache.org  Thu Dec 22 22:23:37 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Thu, 22 Dec 2011 23:23:37 +0100
Subject: [master] 559283b Rename sp->t_end to sp->t_idle,
	which marks when we start listening for a request.
Message-ID: <E1Rdr33-0008TH-D4@project.varnish-software.com>

commit 559283b13b680af6f2f54de986fed2ac6d43d56a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 22:22:23 2011 +0000

    Rename sp->t_end to sp->t_idle, which marks when we start listening
    for a request.
    
    t_open and t_idle are session timestamps.
    
    Have the waiters pass in a T(now) timestamp

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 58419bc..7e7088e 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -616,6 +616,10 @@ struct sess {
 
 	VTAILQ_ENTRY(sess)	list;
 
+	/* Timestamps, all on TIM_real() timescale */
+	double			t_open;		/* fd accepted */
+	double			t_idle;		/* fd accepted or resp sent */
+
 #if defined(HAVE_EPOLL_CTL)
 	struct epoll_event ev;
 #endif
@@ -665,15 +669,13 @@ struct sess {
 
 	uint64_t		req_bodybytes;
 
-	/* TBD fields ------------------------------------------------*/
-
-	struct http_conn	htc[1];
-
 	/* Timestamps, all on TIM_real() timescale */
-	double			t_open;
 	double			t_req;
 	double			t_resp;
-	double			t_end;
+
+	/* TBD fields ------------------------------------------------*/
+
+	struct http_conn	htc[1];
 
 };
 
@@ -915,12 +917,12 @@ void WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len);
 struct sess *SES_New(struct worker *wrk, struct sesspool *pp);
 struct sess *SES_Alloc(void);
 void SES_Close(struct sess *sp, const char *reason);
-void SES_Delete(struct sess *sp, const char *reason);
+void SES_Delete(struct sess *sp, const char *reason, double now);
 void SES_Charge(struct sess *sp);
 struct sesspool *SES_NewPool(struct pool *pp, unsigned pool_no);
 void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
 int SES_Schedule(struct sess *sp);
-void SES_Handle(struct sess *sp);
+void SES_Handle(struct sess *sp, double now);
 
 /* cache_shmlog.c */
 extern struct VSC_C_main *VSC_C_main;
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 87e51a9..1c6d6fb 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -276,7 +276,7 @@ VCA_SetupSess(struct worker *w)
 	sp->vsl_id = wa->acceptsock | VSL_CLIENTMARKER ;
 	wa->acceptsock = -1;
 	sp->t_open = VTIM_real();
-	sp->t_end = sp->t_open;
+	sp->t_idle = sp->t_open;
 	sp->mylsock = wa->acceptlsock;
 	CHECK_OBJ_NOTNULL(sp->mylsock, LISTEN_SOCK_MAGIC);
 	assert(wa->acceptaddrlen <= sp->sockaddrlen);
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 1d92ded..f926932 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -365,15 +365,14 @@ cnt_done(struct sess *sp)
 	}
 
 
-	sp->t_end = W_TIM_real(wrk);
+	sp->t_idle = W_TIM_real(wrk);
 WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
-    sp->t_req, sp->t_resp, sp->t_end,  sp->t_open);
+    sp->t_req, sp->t_resp, sp->t_idle,  sp->t_open);
 	if (sp->xid == 0) {
-		// sp->t_req = sp->t_end;
-		sp->t_resp = sp->t_end;
+		sp->t_resp = sp->t_idle;
 	} else {
 		dp = sp->t_resp - sp->t_req;
-		da = sp->t_end - sp->t_resp;
+		da = sp->t_idle - sp->t_resp;
 		dh = sp->t_req - sp->t_open;
 		/* XXX: Add StatReq == StatSess */
 		/* XXX: Workaround for pipe */
@@ -382,17 +381,16 @@ WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
 			    (uintmax_t)sp->req_bodybytes);
 		}
 		WSP(sp, SLT_ReqEnd, "%u %.9f %.9f %.9f %.9f %.9f",
-		    sp->xid, sp->t_req, sp->t_end, dh, dp, da);
+		    sp->xid, sp->t_req, sp->t_idle, dh, dp, da);
 	}
 	sp->xid = 0;
 	WSL_Flush(wrk, 0);
 
-	sp->t_open = sp->t_end;
+	sp->t_req = NAN;
 	sp->t_resp = NAN;
 
 	sp->req_bodybytes = 0;
 
-	sp->t_req = NAN;
 	sp->hash_always_miss = 0;
 	sp->hash_ignore_busy = 0;
 
@@ -407,7 +405,7 @@ WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
 
 	if (sp->fd < 0) {
 		wrk->stats.sess_closed++;
-		SES_Delete(sp, NULL);
+		SES_Delete(sp, NULL, NAN);
 		return (1);
 	}
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 1b1f87c..46bfb8d 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -168,9 +168,9 @@ ses_setup(struct sessmem *sm)
 	sp->mysockaddrlen = sizeof(sp->mysockaddr);
 	sp->sockaddr.ss_family = sp->mysockaddr.ss_family = PF_UNSPEC;
 	sp->t_open = NAN;
+	sp->t_idle = NAN;
 	sp->t_req = NAN;
 	sp->t_resp = NAN;
-	sp->t_end = NAN;
 	EXP_Clr(&sp->exp);
 
 	WS_Init(sp->ws, "sess", sm->wsp, sm->workspace);
@@ -268,7 +268,7 @@ SES_Schedule(struct sess *sp)
 
 	if (Pool_Schedule(pp->pool, sp)) {
 		VSC_C_main->client_drop_late++;
-		sp->t_end = VTIM_real();
+		sp->t_idle = VTIM_real();
 		if (sp->vcl != NULL) {
 			/*
 			 * A session parked on a busy object can come here
@@ -276,7 +276,7 @@ SES_Schedule(struct sess *sp)
 			 */
 			VCL_Rel(&sp->vcl);
 		}
-		SES_Delete(sp, "dropped");
+		SES_Delete(sp, "dropped", sp->t_idle);
 		return (1);
 	}
 	return (0);
@@ -284,20 +284,21 @@ SES_Schedule(struct sess *sp)
 
 /*--------------------------------------------------------------------
  * Handle a session (from waiter)
- *
- * Status: see HTC_Rx()
  */
 
 void
-SES_Handle(struct sess *sp)
+SES_Handle(struct sess *sp, double now)
 {
 
 	sp->step = STP_WAIT;
+	sp->t_req = now;
 	(void)SES_Schedule(sp);
 }
 
 /*--------------------------------------------------------------------
  * Close a sessions connection.
+ * XXX: Technically speaking we should catch a t_end timestamp here
+ * XXX: for SES_Delete() to use.
  */
 
 void
@@ -322,7 +323,7 @@ SES_Close(struct sess *sp, const char *reason)
  */
 
 void
-SES_Delete(struct sess *sp, const char *reason)
+SES_Delete(struct sess *sp, const char *reason, double now)
 {
 	struct acct *b;
 	struct sessmem *sm;
@@ -340,9 +341,10 @@ SES_Delete(struct sess *sp, const char *reason)
 	wrk = sp->wrk;
 	CHECK_OBJ_ORNULL(wrk, WORKER_MAGIC);
 
-
 	if (reason != NULL)
 		SES_Close(sp, reason);
+	if (isnan(now))
+		now = VTIM_real();
 	assert(sp->fd < 0);
 
 	AZ(sp->vcl);
@@ -353,10 +355,10 @@ SES_Delete(struct sess *sp, const char *reason)
 
 	b = &sp->acct_ses;
 	assert(!isnan(b->first));
-	assert(!isnan(sp->t_end));
 
 	VSL(SLT_StatSess, sp->vsl_id, "%s %s %.0f %ju %ju %ju %ju %ju %ju %ju",
-	    sp->addr, sp->port, sp->t_end - b->first,
+	    sp->addr, sp->port,
+	    now - b->first, 	// XXX ??? 
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
 
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index e71633a..e8f5e2a 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -104,7 +104,7 @@ vwe_cond_modadd(struct vwe *vwe, int fd, void *data)
 }
 
 static void
-vwe_eev(struct vwe *vwe, const struct epoll_event *ep)
+vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
 {
 	struct sess *ss[NEEV], *sp;
 	int i, j;
@@ -130,16 +130,16 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep)
 		CAST_OBJ_NOTNULL(sp, ep->data.ptr, SESS_MAGIC);
 		if (ep->events & EPOLLIN || ep->events & EPOLLPRI) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Handle(sp);
+			SES_Handle(sp, now);
 		} else if (ep->events & EPOLLERR) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Delete(sp, "ERR");
+			SES_Delete(sp, "ERR", now);
 		} else if (ep->events & EPOLLHUP) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Delete(sp, "HUP");
+			SES_Delete(sp, "HUP", now);
 		} else if (ep->events & EPOLLRDHUP) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Delete(sp, "RHUP");
+			SES_Delete(sp, "RHUP", now);
 		}
 	}
 }
@@ -152,7 +152,7 @@ vwe_thread(void *priv)
 	struct epoll_event ev[NEEV], *ep;
 	struct sess *sp;
 	char junk;
-	double deadline;
+	double now, deadline;
 	int dotimer, i, n;
 	struct vwe *vwe;
 
@@ -169,6 +169,7 @@ vwe_thread(void *priv)
 	while (1) {
 		dotimer = 0;
 		n = epoll_wait(vwe->epfd, ev, NEEV, -1);
+		now = VTIM_real();
 		for (ep = ev, i = 0; i < n; i++, ep++) {
 			if (ep->data.ptr == vwe->timer_pipes &&
 			    (ep->events == EPOLLIN || ep->events == EPOLLPRI))
@@ -176,22 +177,22 @@ vwe_thread(void *priv)
 				assert(read(vwe->timer_pipes[0], &junk, 1));
 				dotimer = 1;
 			} else
-				vwe_eev(vwe, ep);
+				vwe_eev(vwe, ep, now);
 		}
 		if (!dotimer)
 			continue;
 
 		/* check for timeouts */
-		deadline = VTIM_real() - cache_param->sess_timeout;
+		deadline = now - cache_param->sess_timeout;
 		for (;;) {
 			sp = VTAILQ_FIRST(&vwe->sesshead);
 			if (sp == NULL)
 				break;
-			if (sp->t_open > deadline)
+			if (sp->t_idle > deadline)
 				break;
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
 			// XXX: not yet VTCP_linger(sp->fd, 0);
-			SES_Delete(sp, "timeout");
+			SES_Delete(sp, "timeout", now);
 		}
 	}
 	return (NULL);
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index e11f945..707c902 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -114,7 +114,7 @@ vwk_pipe_ev(struct vwk *vwk, const struct kevent *kp)
 /*--------------------------------------------------------------------*/
 
 static void
-vwk_sess_ev(struct vwk *vwk, const struct kevent *kp)
+vwk_sess_ev(struct vwk *vwk, const struct kevent *kp, double now)
 {
 	struct sess *sp;
 
@@ -129,11 +129,11 @@ vwk_sess_ev(struct vwk *vwk, const struct kevent *kp)
 	assert((sp->vsl_id & VSL_IDENTMASK) == sp->fd);
 	if (kp->data > 0) {
 		VTAILQ_REMOVE(&vwk->sesshead, sp, list);
-		SES_Handle(sp);
+		SES_Handle(sp, now);
 		return;
 	} else if (kp->flags & EV_EOF) {
 		VTAILQ_REMOVE(&vwk->sesshead, sp, list);
-		SES_Delete(sp, "EOF");
+		SES_Delete(sp, "EOF", now);
 		return;
 	} else {
 		VSL(SLT_Debug, sp->vsl_id,
@@ -151,7 +151,7 @@ vwk_thread(void *priv)
 	struct vwk *vwk;
 	struct kevent ke[NKEV], *kp;
 	int j, n, dotimer;
-	double deadline;
+	double now, deadline;
 	struct sess *sp;
 
 	CAST_OBJ_NOTNULL(vwk, priv, VWK_MAGIC);
@@ -171,6 +171,7 @@ vwk_thread(void *priv)
 	while (1) {
 		dotimer = 0;
 		n = kevent(vwk->kq, vwk->ki, vwk->nki, ke, NKEV, NULL);
+		now = VTIM_real();
 		assert(n >= 1 && n <= NKEV);
 		vwk->nki = 0;
 		for (kp = ke, j = 0; j < n; j++, kp++) {
@@ -181,7 +182,7 @@ vwk_thread(void *priv)
 				vwk_pipe_ev(vwk, kp);
 			} else {
 				assert(kp->filter == EVFILT_READ);
-				vwk_sess_ev(vwk, kp);
+				vwk_sess_ev(vwk, kp, now);
 			}
 		}
 		if (!dotimer)
@@ -194,16 +195,16 @@ vwk_thread(void *priv)
 		 * would not know we meant "the old fd of this number".
 		 */
 		vwk_kq_flush(vwk);
-		deadline = VTIM_real() - cache_param->sess_timeout;
+		deadline = now - cache_param->sess_timeout;
 		for (;;) {
 			sp = VTAILQ_FIRST(&vwk->sesshead);
 			if (sp == NULL)
 				break;
-			if (sp->t_open > deadline)
+			if (sp->t_idle > deadline)
 				break;
 			VTAILQ_REMOVE(&vwk->sesshead, sp, list);
 			// XXX: not yet (void)VTCP_linger(sp->fd, 0);
-			SES_Delete(sp, "timeout");
+			SES_Delete(sp, "timeout", now);
 		}
 	}
 }
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index cf750ad..3a39c6b 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -123,7 +123,7 @@ vwp_main(void *priv)
 	int v, v2;
 	struct vwp *vwp;
 	struct sess *ss[NEEV], *sp, *sp2;
-	double deadline;
+	double now, deadline;
 	int i, j, fd;
 
 	CAST_OBJ_NOTNULL(vwp, priv, VWP_MAGIC);
@@ -140,7 +140,8 @@ vwp_main(void *priv)
 		assert(vwp->pollfd[vwp->pipes[1]].fd == -1);
 		v = poll(vwp->pollfd, vwp->hpoll + 1, 100);
 		assert(v >= 0);
-		deadline = VTIM_real() - cache_param->sess_timeout;
+		now = VTIM_real();
+		deadline = now - cache_param->sess_timeout;
 		v2 = v;
 		VTAILQ_FOREACH_SAFE(sp, &vwp->sesshead, list, sp2) {
 			if (v != 0 && v2 == 0)
@@ -156,12 +157,12 @@ vwp_main(void *priv)
 				vwp->pollfd[fd].revents = 0;
 				VTAILQ_REMOVE(&vwp->sesshead, sp, list);
 				vwp_unpoll(vwp, fd);
-				SES_Handle(sp);
-			} else if (sp->t_open <= deadline) {
+				SES_Handle(sp, now);
+			} else if (sp->t_idle <= deadline) {
 				VTAILQ_REMOVE(&vwp->sesshead, sp, list);
 				vwp_unpoll(vwp, fd);
 				// XXX: not yet (void)VTCP_linger(sp->fd, 0);
-				SES_Delete(sp, "timeout");
+				SES_Delete(sp, "timeout", now);
 			}
 		}
 		if (v2 && vwp->pollfd[vwp->pipes[0]].revents) {
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 09db406..0d05775 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -72,7 +72,7 @@ vws_del(struct vws *vws, int fd)
 }
 
 static inline void
-vws_port_ev(struct vws *vws, port_event_t *ev) {
+vws_port_ev(struct vws *vws, port_event_t *ev, double now) {
 	struct sess *sp;
 	if(ev->portev_source == PORT_SOURCE_USER) {
 		CAST_OBJ_NOTNULL(sp, ev->portev_user, SESS_MAGIC);
@@ -87,7 +87,7 @@ vws_port_ev(struct vws *vws, port_event_t *ev) {
 		if(ev->portev_events & POLLERR) {
 			vws_del(vws, sp->fd);
 			VTAILQ_REMOVE(&vws->sesshead, sp, list);
-			SES_Delete(sp, "EOF");
+			SES_Delete(sp, "EOF", now);
 			return;
 		}
 
@@ -108,7 +108,7 @@ vws_port_ev(struct vws *vws, port_event_t *ev) {
 		VTAILQ_REMOVE(&vws->sesshead, sp, list);
 
 		/* SES_Handle will also handle errors */
-		SES_Handle(sp);
+		SES_Handle(sp, now);
 	}
 	return;
 }
@@ -182,15 +182,15 @@ vws_thread(void *priv)
 		 */
 
 		ret = port_getn(vws->dport, ev, MAX_EVENTS, &nevents, timeout);
+		now = VTIM_real();
 
 		if (ret < 0)
 			assert((errno == EINTR) || (errno == ETIME));
 
 		for (ei = 0; ei < nevents; ei++)
-			vws_port_ev(vws, ev + ei);
+			vws_port_ev(vws, ev + ei, now);
 
 		/* check for timeouts */
-		now = VTIM_real();
 		deadline = now - cache_param->sess_timeout;
 
 		/*
@@ -204,14 +204,14 @@ vws_thread(void *priv)
 			sp = VTAILQ_FIRST(&vws->sesshead);
 			if (sp == NULL)
 				break;
-			if (sp->t_open > deadline) {
+			if (sp->t_idle > deadline) {
 				break;
 			}
 			VTAILQ_REMOVE(&vws->sesshead, sp, list);
 			if(sp->fd != -1) {
 				vws_del(vws, sp->fd);
 			}
-			SES_Delete(sp, "timeout");
+			SES_Delete(sp, "timeout", now);
 		}
 
 		/*



From phk at varnish-cache.org  Thu Dec 22 23:51:51 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 00:51:51 +0100
Subject: [master] a9852b4 Rework the code that receives the client request.
Message-ID: <E1RdsQR-0000UN-Be@project.varnish-software.com>

commit a9852b4c420afea2bf7191d1b5cb47dc64b92399
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 22 23:51:16 2011 +0000

    Rework the code that receives the client request.
    
    Collect all the code in cnt_wait()
    
    Add a new -3 return code from HTC which says that all we've seen so
    far is white space.  Use the RFC2616 "LWS" definition of white-space.
    
    Rename "sess_timeout" parameter to "timeout_idle" and describe it more
    precisely.  Make it a double, so more precise values can be specified.
    The sessions is considered idle even if we receive white-space.
    
    Rename "session_linger" parameter to "timeout_linger", make it a double
    and give it units of seconds like other timeouts.
    
    Add new parameter "timeout_req" which controls how long time we give
    the client to send the request headers, from the first non-white char.
    Set it to two seconds.  Experimentation/Experience requested.
    
    "timeout_req" also gives us positive control of any kind of
    "slowlaris" attack scenarios.
    
    I'm trying to group parameters more sensibly, since we sort them
    by name, calling them all timeout_*, pool_* etc, makes some sense I hope.

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 1c6d6fb..1f9616a 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -276,6 +276,7 @@ VCA_SetupSess(struct worker *w)
 	sp->vsl_id = wa->acceptsock | VSL_CLIENTMARKER ;
 	wa->acceptsock = -1;
 	sp->t_open = VTIM_real();
+	sp->t_req = sp->t_open;
 	sp->t_idle = sp->t_open;
 	sp->mylsock = wa->acceptlsock;
 	CHECK_OBJ_NOTNULL(sp->mylsock, LISTEN_SOCK_MAGIC);
@@ -293,7 +294,7 @@ static void *
 vca_acct(void *arg)
 {
 #ifdef SO_RCVTIMEO_WORKS
-	double sess_timeout = 0;
+	double timeout_idle = 0;
 #endif
 #ifdef SO_SNDTIMEO_WORKS
 	double send_timeout = 0;
@@ -333,10 +334,10 @@ vca_acct(void *arg)
 		}
 #endif
 #ifdef SO_RCVTIMEO_WORKS
-		if (cache_param->sess_timeout != sess_timeout) {
+		if (cache_param->timeout_idle != timeout_idle) {
 			need_test = 1;
-			sess_timeout = cache_param->sess_timeout;
-			tv_rcvtimeo = VTIM_timeval(sess_timeout);
+			timeout_idle = cache_param->timeout_idle;
+			tv_rcvtimeo = VTIM_timeval(timeout_idle);
 			VTAILQ_FOREACH(ls, &heritage.socks, list) {
 				if (ls->sock < 0)
 					continue;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index f926932..b14ec24 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -98,9 +98,10 @@ DOT }
 static int
 cnt_wait(struct sess *sp)
 {
-	int i;
+	int i, j, tmo;
 	struct pollfd pfd[1];
 	struct worker *wrk;
+	double now, when;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
@@ -110,33 +111,59 @@ cnt_wait(struct sess *sp)
 	AZ(sp->esi_level);
 	assert(sp->xid == 0);
 
-	i = HTC_Complete(sp->htc);
-	if (i == 0 && cache_param->session_linger > 0) {
+	assert(!isnan(sp->t_req));
+	tmo = (int)(1e3 * cache_param->timeout_linger);
+	while (1) {
 		pfd[0].fd = sp->fd;
 		pfd[0].events = POLLIN;
 		pfd[0].revents = 0;
-		i = poll(pfd, 1, cache_param->session_linger);
-		if (i)
+		j = poll(pfd, 1, tmo);
+		assert(j >= 0);
+		if (j != 0)
 			i = HTC_Rx(sp->htc);
+		else
+			i = HTC_Complete(sp->htc);
+		if (i == -1) {
+			SES_Close(sp, "EOF");
+			break;
+		}
+		if (i == -2) {
+			SES_Close(sp, "overflow");
+			break;
+		}
+		now = VTIM_real();
+		if (i == 1) {
+			/* Got it, run with it */
+			sp->t_req = now;
+			sp->step = STP_START;
+			return (0);
+		}
+		if (i == -3) {
+			/* Nothing but whitespace */
+			when = sp->t_idle + cache_param->timeout_idle;
+			if (when < now) {
+				SES_Close(sp, "timeout");
+				break;
+			}
+			when = sp->t_idle + cache_param->timeout_linger;
+			tmo = (int)(1e3 * (when - now));
+			if (when < now || tmo == 0) {
+				sp->t_req = NAN;
+				wrk->stats.sess_herd++;
+				SES_Charge(sp);
+				WAIT_Enter(sp);
+				return (1);
+			}
+		} else {
+			/* Working on it */
+			when = sp->t_req + cache_param->timeout_req;
+			tmo = (int)(1e3 * (when - now));
+			if (when < now || tmo == 0) {
+				SES_Close(sp, "req timeout");
+				break;
+			}
+		}
 	}
-	if (i == 0) {
-		WSP(sp, SLT_Debug, "herding");
-		wrk->stats.sess_herd++;
-		SES_Charge(sp);
-		WAIT_Enter(sp);
-		return (1);
-	}
-	if (i == 1) {
-		sp->step = STP_START;
-		return (0);
-	}
-	if (i == -2) {
-		SES_Close(sp, "overflow");
-	} else if (i == -1 && Tlen(sp->htc->rxbuf) == 0 &&
-	    (errno == 0 || errno == ECONNRESET))
-		SES_Close(sp, "EOF");
-	else
-		SES_Close(sp, "error");
 	sp->step = STP_DONE;
 	return (0);
 }
@@ -366,8 +393,6 @@ cnt_done(struct sess *sp)
 
 
 	sp->t_idle = W_TIM_real(wrk);
-WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
-    sp->t_req, sp->t_resp, sp->t_idle,  sp->t_open);
 	if (sp->xid == 0) {
 		sp->t_resp = sp->t_idle;
 	} else {
@@ -418,17 +443,20 @@ WSP(sp, SLT_Debug, "PHK req %.9f resp %.9f end %.9f open %.9f",
 	i = HTC_Reinit(sp->htc);
 	if (i == 1) {
 		wrk->stats.sess_pipeline++;
+		sp->t_req = sp->t_idle;
 		sp->step = STP_START;
 		return (0);
 	}
 	if (Tlen(sp->htc->rxbuf)) {
 		wrk->stats.sess_readahead++;
 		sp->step = STP_WAIT;
+		sp->t_req = sp->t_idle;
 		return (0);
 	}
-	if (cache_param->session_linger > 0) {
+	if (cache_param->timeout_linger > 0.) {
 		wrk->stats.sess_linger++;
 		sp->step = STP_WAIT;
+		sp->t_req = sp->t_idle;		// XXX: not quite correct
 		return (0);
 	}
 	wrk->stats.sess_herd++;
@@ -1574,7 +1602,7 @@ cnt_start(struct sess *sp)
 
 	/* Update stats of various sorts */
 	wrk->stats.client_req++;
-	sp->t_req = W_TIM_real(wrk);
+	assert(!isnan(sp->t_req));
 	wrk->acct_tmp.req++;
 
 	/* Assign XID and log */
diff --git a/bin/varnishd/cache/cache_httpconn.c b/bin/varnishd/cache/cache_httpconn.c
index 9e0a052..1abd2a4 100644
--- a/bin/varnishd/cache/cache_httpconn.c
+++ b/bin/varnishd/cache/cache_httpconn.c
@@ -50,6 +50,7 @@
  * Check if we have a complete HTTP request or response yet
  *
  * Return values:
+ *	-3  All whitespace so far
  *	 0  No, keep trying
  *	>0  Yes, it is this many bytes long.
  */
@@ -62,13 +63,13 @@ htc_header_complete(txt *t)
 	Tcheck(*t);
 	assert(*t->e == '\0');
 	/* Skip any leading white space */
-	for (p = t->b ; vct_issp(*p); p++)
+	for (p = t->b ; vct_islws(*p); p++)
 		continue;
 	if (p == t->e) {
 		/* All white space */
 		t->e = t->b;
 		*t->e = '\0';
-		return (0);
+		return (-3);
 	}
 	while (1) {
 		p = strchr(p, '\n');
@@ -133,6 +134,8 @@ HTC_Reinit(struct http_conn *htc)
 }
 
 /*--------------------------------------------------------------------
+ * Return -3 if it's all whitespace so far
+ * Return 0 if we need more text
  * Return 1 if we have a complete HTTP procol header
  */
 
@@ -143,9 +146,8 @@ HTC_Complete(struct http_conn *htc)
 
 	CHECK_OBJ_NOTNULL(htc, HTTP_CONN_MAGIC);
 	i = htc_header_complete(&htc->rxbuf);
-	assert(i >= 0);
-	if (i == 0)
-		return (0);
+	if (i <= 0)
+		return (i);
 	WS_ReleaseP(htc->ws, htc->rxbuf.e);
 	AZ(htc->pipeline.b);
 	AZ(htc->pipeline.e);
@@ -160,8 +162,9 @@ HTC_Complete(struct http_conn *htc)
 /*--------------------------------------------------------------------
  * Receive more HTTP protocol bytes
  * Returns:
+ *	-3 all whitespace so far
  *	-2 overflow
- *	-1 error
+ *	-1 error/EOF
  *	 0 more needed
  *	 1 got complete HTTP header
  */
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index a024452..0a476d4 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -85,8 +85,9 @@ struct params {
 
 	unsigned		shm_reclen;
 
-	/* Acceptor hints */
-	unsigned		sess_timeout;
+	double			timeout_linger;
+	double			timeout_idle;
+	double			timeout_req;
 	unsigned		pipe_timeout;
 	unsigned		send_timeout;
 	unsigned		idle_send_timeout;
@@ -140,9 +141,6 @@ struct params {
 	double			first_byte_timeout;
 	double			between_bytes_timeout;
 
-	/* How long to linger on sessions */
-	unsigned		session_linger;
-
 	/* CLI buffer size */
 	unsigned		cli_buffer;
 
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index c236323..2f7bd53 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -773,12 +773,19 @@ static const struct parspec input_parspec[] = {
 		"cache at the end of ttl+grace+keep.",
 		DELAYED_EFFECT,
 		"0", "seconds" },
-	{ "sess_timeout", tweak_timeout, &mgt_param.sess_timeout, 0, 0,
-		"Idle timeout for persistent sessions. "
-		"If a HTTP request has not been received in this many "
-		"seconds, the session is closed.",
+	{ "timeout_idle", tweak_timeout_double, &mgt_param.timeout_idle,
+		0, UINT_MAX,
+		"Idle timeout for client connections.\n"
+		"A connection is considered idle, until we receive"
+		" a non-white-space character on it.",
 		0,
 		"5", "seconds" },
+	{ "timeout_req", tweak_timeout_double, &mgt_param.timeout_req,
+		0, UINT_MAX,
+		"Max time to receive clients request header, measured"
+		" from first non-white-space character to double CRNL.",
+		0,
+		"2", "seconds" },
 	{ "expiry_sleep", tweak_timeout_double, &mgt_param.expiry_sleep, 0, 60,
 		"How long the expiry thread sleeps when there is nothing "
 		"for it to do.\n",
@@ -993,18 +1000,18 @@ static const struct parspec input_parspec[] = {
 		"it.\n",
 		0,
 		"100000", "sessions" },
-	{ "session_linger", tweak_uint,
-		&mgt_param.session_linger,0, UINT_MAX,
-		"How long time the workerthread lingers on the session "
-		"to see if a new request appears right away.\n"
-		"If sessions are reused, as much as half of all reuses "
+	{ "timeout_linger", tweak_timeout_double, &mgt_param.timeout_linger,
+		0, UINT_MAX,
+		"How long time the workerthread lingers on an idle session "
+		"before handing it over to the waiter.\n"
+		"When sessions are reused, as much as half of all reuses "
 		"happen within the first 100 msec of the previous request "
 		"completing.\n"
 		"Setting this too high results in worker threads not doing "
 		"anything for their keep, setting it too low just means that "
 		"more sessions take a detour around the waiter.",
 		EXPERIMENTAL,
-		"50", "ms" },
+		"0.050", "seconds" },
 	{ "log_hashstring", tweak_bool, &mgt_param.log_hash, 0, 0,
 		"Log the hash string components to shared memory log.\n",
 		0,
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index e8f5e2a..6ad5be5 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -183,7 +183,7 @@ vwe_thread(void *priv)
 			continue;
 
 		/* check for timeouts */
-		deadline = now - cache_param->sess_timeout;
+		deadline = now - cache_param->timeout_idle;
 		for (;;) {
 			sp = VTAILQ_FIRST(&vwe->sesshead);
 			if (sp == NULL)
@@ -201,13 +201,13 @@ vwe_thread(void *priv)
 /*--------------------------------------------------------------------*/
 
 static void *
-vwe_sess_timeout_ticker(void *priv)
+vwe_timeout_idle_ticker(void *priv)
 {
 	char ticker = 'R';
 	struct vwe *vwe;
 
 	CAST_OBJ_NOTNULL(vwe, priv, VWE_MAGIC);
-	THR_SetName("cache-epoll-sess_timeout_ticker");
+	THR_SetName("cache-epoll-timeout_idle_ticker");
 
 	while (1) {
 		/* ticking */
@@ -255,7 +255,7 @@ vwe_init(void)
 	assert(i != -1);
 
 	AZ(pthread_create(&vwe->timer_thread,
-	    NULL, vwe_sess_timeout_ticker, vwe));
+	    NULL, vwe_timeout_idle_ticker, vwe));
 	AZ(pthread_create(&vwe->epoll_thread, NULL, vwe_thread, vwe));
 	return(vwe);
 }
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 707c902..423bf26 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -195,7 +195,7 @@ vwk_thread(void *priv)
 		 * would not know we meant "the old fd of this number".
 		 */
 		vwk_kq_flush(vwk);
-		deadline = now - cache_param->sess_timeout;
+		deadline = now - cache_param->timeout_idle;
 		for (;;) {
 			sp = VTAILQ_FIRST(&vwk->sesshead);
 			if (sp == NULL)
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 3a39c6b..a31bec1 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -141,7 +141,7 @@ vwp_main(void *priv)
 		v = poll(vwp->pollfd, vwp->hpoll + 1, 100);
 		assert(v >= 0);
 		now = VTIM_real();
-		deadline = now - cache_param->sess_timeout;
+		deadline = now - cache_param->timeout_idle;
 		v2 = v;
 		VTAILQ_FOREACH_SAFE(sp, &vwp->sesshead, list, sp2) {
 			if (v != 0 && v2 == 0)
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 0d05775..4f39ca4 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -191,7 +191,7 @@ vws_thread(void *priv)
 			vws_port_ev(vws, ev + ei, now);
 
 		/* check for timeouts */
-		deadline = now - cache_param->sess_timeout;
+		deadline = now - cache_param->timeout_idle;
 
 		/*
 		 * This loop assumes that the oldest sessions are always at the
@@ -220,7 +220,7 @@ vws_thread(void *priv)
 
 		if (sp) {
 			double tmo =
-			    (sp->t_open + cache_param->sess_timeout) - now;
+			    (sp->t_open + cache_param->timeout_idle) - now;
 
 			/*
 			 * we should have removed all sps whose timeout
diff --git a/bin/varnishtest/tests/r00262.vtc b/bin/varnishtest/tests/r00262.vtc
index 1ef7255..b3c1cf9 100644
--- a/bin/varnishtest/tests/r00262.vtc
+++ b/bin/varnishtest/tests/r00262.vtc
@@ -7,7 +7,7 @@ server s1 {
 		-body "012345\n"
 } -start
 
-varnish v1 -arg "-p session_linger=20" -vcl+backend { } -start 
+varnish v1 -arg "-p timeout_linger=20" -vcl+backend { } -start 
 
 client c1 {
 	send "GET / HTTP/1.1\r\n\r\n\r\n"
diff --git a/bin/varnishtest/tests/r00524.vtc b/bin/varnishtest/tests/r00524.vtc
index 157eebe..cd43e97 100644
--- a/bin/varnishtest/tests/r00524.vtc
+++ b/bin/varnishtest/tests/r00524.vtc
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 	sub vcl_fetch {
 		set beresp.do_esi = true;
 	}
-} -cliok "param.set sess_timeout 60" -start
+} -cliok "param.set timeout_idle 60" -start
 
 client c1 {
 	txreq -proto HTTP/1.0 -hdr "Connection: kEep-alive"
diff --git a/bin/varnishtest/tests/r00641.vtc b/bin/varnishtest/tests/r00641.vtc
index ef825d7..da54121 100644
--- a/bin/varnishtest/tests/r00641.vtc
+++ b/bin/varnishtest/tests/r00641.vtc
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 	sub vcl_fetch {
 		set beresp.do_esi = true;
 	}
-} -cliok "param.set sess_timeout 60" -start
+} -cliok "param.set timeout_idle 60" -start
 
 client c1 {
 	txreq -proto HTTP/1.1



From phk at varnish-cache.org  Fri Dec 23 07:21:37 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 08:21:37 +0100
Subject: [master] 2c90d78 Remove redundant field
Message-ID: <E1RdzRh-0005L8-R4@project.varnish-software.com>

commit 2c90d78747a527fc8d55893d4d8eed68fe1120be
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 07:21:21 2011 +0000

    Remove redundant field

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 7e7088e..b674bd7 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -198,7 +198,6 @@ struct http_conn {
 /*--------------------------------------------------------------------*/
 
 struct acct {
-	double			first;
 #define ACCT(foo)	uint64_t	foo;
 #include "tbl/acct_fields.h"
 #undef ACCT
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index b14ec24..052a68b 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1019,7 +1019,8 @@ cnt_streambody(struct sess *sp)
 }
 
 /*--------------------------------------------------------------------
- * The very first request
+ * A freshly accepted socket
+ *
 DOT subgraph xcluster_first {
 DOT	first [
 DOT		shape=box
@@ -1040,16 +1041,10 @@ cnt_first(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-	/*
-	 * XXX: If we don't have acceptfilters we are somewhat subject
-	 * XXX: to DoS'ing here.  One remedy would be to set a shorter
-	 * XXX: SO_RCVTIMEO and once we have received something here
-	 * XXX: increase it to the normal value.
-	 */
-
 	assert(sp->xid == 0);
 	assert(sp->restarts == 0);
 	AZ(sp->esi_level);
+
 	VTCP_name(&sp->sockaddr, sp->sockaddrlen,
 	    sp->addr, sizeof sp->addr, sp->port, sizeof sp->port);
 	if (cache_param->log_local_addr) {
@@ -1063,7 +1058,6 @@ cnt_first(struct sess *sp)
 		WSP(sp, SLT_SessionOpen, "%s %s %s",
 		    sp->addr, sp->port, sp->mylsock->name);
 	}
-	sp->acct_ses.first = sp->t_open;
 
 	/* Receive a HTTP protocol request */
 	HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id,
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 46bfb8d..1292e5e 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -345,6 +345,7 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 		SES_Close(sp, reason);
 	if (isnan(now))
 		now = VTIM_real();
+	assert(!isnan(sp->t_open));
 	assert(sp->fd < 0);
 
 	AZ(sp->vcl);
@@ -354,11 +355,10 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 		strcpy(sp->addr, "-");
 
 	b = &sp->acct_ses;
-	assert(!isnan(b->first));
 
 	VSL(SLT_StatSess, sp->vsl_id, "%s %s %.0f %ju %ju %ju %ju %ju %ju %ju",
 	    sp->addr, sp->port,
-	    now - b->first, 	// XXX ??? 
+	    now - sp->t_open,
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
 



From phk at varnish-cache.org  Fri Dec 23 07:28:44 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 08:28:44 +0100
Subject: [master] bd76542 Collapse two functions for clarity
Message-ID: <E1RdzYa-0005iD-EO@project.varnish-software.com>

commit bd765420099d605322eae4049f56a8998544e837
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 07:28:30 2011 +0000

    Collapse two functions for clarity

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 1f9616a..da35db4 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -128,32 +128,6 @@ sock_test(int fd)
 }
 
 /*--------------------------------------------------------------------
- * Called once the workerthread gets hold of the session, to fix up
- * any socket options that need it.
- */
-
-static void
-vca_prep(const struct sess *sp)
-{
-
-	if (need_test)
-		sock_test(sp->fd);
-	if (need_linger)
-		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_LINGER,
-		    &linger, sizeof linger));
-#ifdef SO_SNDTIMEO_WORKS
-	if (need_sndtimeo)
-		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_SNDTIMEO,
-		    &tv_sndtimeo, sizeof tv_sndtimeo));
-#endif
-#ifdef SO_RCVTIMEO_WORKS
-	if (need_rcvtimeo)
-		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_RCVTIMEO,
-		    &tv_rcvtimeo, sizeof tv_rcvtimeo));
-#endif
-}
-
-/*--------------------------------------------------------------------
  * If accept(2)'ing fails, we pace ourselves to relive any resource
  * shortage if possible.
  */
@@ -285,7 +259,22 @@ VCA_SetupSess(struct worker *w)
 	sp->sockaddrlen = wa->acceptaddrlen;
 	vca_pace_good();
 	w->stats.sess_conn++;
-	vca_prep(sp);
+
+	if (need_test)
+		sock_test(sp->fd);
+	if (need_linger)
+		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_LINGER,
+		    &linger, sizeof linger));
+#ifdef SO_SNDTIMEO_WORKS
+	if (need_sndtimeo)
+		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_SNDTIMEO,
+		    &tv_sndtimeo, sizeof tv_sndtimeo));
+#endif
+#ifdef SO_RCVTIMEO_WORKS
+	if (need_rcvtimeo)
+		VTCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_RCVTIMEO,
+		    &tv_rcvtimeo, sizeof tv_rcvtimeo));
+#endif
 }
 
 /*--------------------------------------------------------------------*/



From phk at varnish-cache.org  Fri Dec 23 08:56:29 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 09:56:29 +0100
Subject: [master] 4354cd7 Delete the session directly if we never manage to
	collect a full request header: There is no point in going
	through cnt_done to do that.
Message-ID: <E1Re0vV-000130-Al@project.varnish-software.com>

commit 4354cd713f2db1c55db169927e0d5e001a5a19ff
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 07:37:20 2011 +0000

    Delete the session directly if we never manage to collect a full
    request header:  There is no point in going through cnt_done to do that.

diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 052a68b..6587bf2 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -86,11 +86,11 @@ static unsigned xids;
 DOT subgraph xcluster_wait {
 DOT	wait [
 DOT		shape=box
-DOT		label="wait for\nrequest"
+DOT		label="cnt_wait:\nwait for\nrequest"
 DOT	]
 DOT	herding [shape=hexagon]
 DOT	wait -> start [label="got req"]
-DOT	wait -> DONE [label="errors"]
+DOT	wait -> "SES_Delete()" [label="errors"]
 DOT	wait -> herding [label="timeout"]
 DOT }
  */
@@ -119,31 +119,30 @@ cnt_wait(struct sess *sp)
 		pfd[0].revents = 0;
 		j = poll(pfd, 1, tmo);
 		assert(j >= 0);
+		now = VTIM_real();
 		if (j != 0)
 			i = HTC_Rx(sp->htc);
 		else
 			i = HTC_Complete(sp->htc);
-		if (i == -1) {
-			SES_Close(sp, "EOF");
-			break;
-		}
-		if (i == -2) {
-			SES_Close(sp, "overflow");
-			break;
-		}
-		now = VTIM_real();
 		if (i == 1) {
 			/* Got it, run with it */
 			sp->t_req = now;
-			sp->step = STP_START;
-			return (0);
+			break;
+		}
+		if (i == -1) {
+			SES_Delete(sp, "EOF", now);
+			return (1);
+		}
+		if (i == -2) {
+			SES_Delete(sp, "overflow", now);
+			return (1);
 		}
 		if (i == -3) {
 			/* Nothing but whitespace */
 			when = sp->t_idle + cache_param->timeout_idle;
 			if (when < now) {
-				SES_Close(sp, "timeout");
-				break;
+				SES_Delete(sp, "timeout", now);
+				return (1);
 			}
 			when = sp->t_idle + cache_param->timeout_linger;
 			tmo = (int)(1e3 * (when - now));
@@ -159,12 +158,12 @@ cnt_wait(struct sess *sp)
 			when = sp->t_req + cache_param->timeout_req;
 			tmo = (int)(1e3 * (when - now));
 			if (when < now || tmo == 0) {
-				SES_Close(sp, "req timeout");
-				break;
+				SES_Delete(sp, "req timeout", now);
+				return (1);
 			}
 		}
 	}
-	sp->step = STP_DONE;
+	sp->step = STP_START;
 	return (0);
 }
 



From phk at varnish-cache.org  Fri Dec 23 08:56:29 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 09:56:29 +0100
Subject: [master] c0442f9 Only allocate sp->req where we need it.
Message-ID: <E1Re0vV-000135-By@project.varnish-software.com>

commit c0442f9041083486532712589bc7584ef9f9c53b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 08:55:52 2011 +0000

    Only allocate sp->req where we need it.
    
    It's lifetime is now controlled by the timeout_linger parameter, so that
    the waiters won't have to think about it at all.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index b674bd7..3c37176 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -922,6 +922,8 @@ struct sesspool *SES_NewPool(struct pool *pp, unsigned pool_no);
 void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
 int SES_Schedule(struct sess *sp);
 void SES_Handle(struct sess *sp, double now);
+void SES_GetReq(struct sess *sp);
+void SES_ReleaseReq(struct sess *sp);
 
 /* cache_shmlog.c */
 extern struct VSC_C_main *VSC_C_main;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 6587bf2..a119360 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -37,7 +37,7 @@
  * a dot(1) graph in the source code comments.  So to see the big picture,
  * extract the DOT lines and run though dot(1), for instance with the
  * command:
- *	sed -n '/^DOT/s///p' cache_center.c | dot -Tps > /tmp/_.ps
+ *	sed -n '/^DOT/s///p' cache/cache_center.c | dot -Tps > /tmp/_.ps
  */
 
 /*
@@ -91,7 +91,8 @@ DOT	]
 DOT	herding [shape=hexagon]
 DOT	wait -> start [label="got req"]
 DOT	wait -> "SES_Delete()" [label="errors"]
-DOT	wait -> herding [label="timeout"]
+DOT	wait -> herding [label="timeout_linger"]
+DOT	herding -> wait [label="fd read_ready"]
 DOT }
  */
 
@@ -106,6 +107,9 @@ cnt_wait(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	if (sp->req == NULL)
+		SES_GetReq(sp);
+
 	AZ(sp->vcl);
 	AZ(wrk->obj);
 	AZ(sp->esi_level);
@@ -150,6 +154,7 @@ cnt_wait(struct sess *sp)
 				sp->t_req = NAN;
 				wrk->stats.sess_herd++;
 				SES_Charge(sp);
+				SES_ReleaseReq(sp);
 				WAIT_Enter(sp);
 				return (1);
 			}
@@ -350,10 +355,10 @@ cnt_deliver(struct sess *sp)
  *
 DOT	DONE [
 DOT		shape=hexagon
-DOT		label="Request completed"
+DOT		label="cnt_done:\nRequest completed"
 DOT	]
 DOT	ESI_RESP [ shape=hexagon ]
-DOT	DONE -> start
+DOT	DONE -> start [label="full pipeline"]
 DOT	DONE -> wait
 DOT	DONE -> ESI_RESP
  */
@@ -446,21 +451,11 @@ cnt_done(struct sess *sp)
 		sp->step = STP_START;
 		return (0);
 	}
-	if (Tlen(sp->htc->rxbuf)) {
+	if (Tlen(sp->htc->rxbuf))
 		wrk->stats.sess_readahead++;
-		sp->step = STP_WAIT;
-		sp->t_req = sp->t_idle;
-		return (0);
-	}
-	if (cache_param->timeout_linger > 0.) {
-		wrk->stats.sess_linger++;
-		sp->step = STP_WAIT;
-		sp->t_req = sp->t_idle;		// XXX: not quite correct
-		return (0);
-	}
-	wrk->stats.sess_herd++;
-	WAIT_Enter(sp);
-	return (1);
+	sp->step = STP_WAIT;
+	sp->t_req = sp->t_idle;
+	return (0);
 }
 
 /*--------------------------------------------------------------------
@@ -1023,7 +1018,7 @@ cnt_streambody(struct sess *sp)
 DOT subgraph xcluster_first {
 DOT	first [
 DOT		shape=box
-DOT		label="first\nConfigure data structures"
+DOT		label="cnt_first:\nSockaddr's"
 DOT	]
 DOT }
 DOT first -> wait
@@ -1567,11 +1562,11 @@ cnt_recv(struct sess *sp)
 
 /*--------------------------------------------------------------------
  * START
- * Handle a request, wherever it came from recv/restart.
+ * Handle a request.
  *
 DOT start [
 DOT	shape=box
-DOT	label="Dissect request\nHandle expect"
+DOT	label="cnt_start:\nDissect request\nHandle expect"
 DOT ]
 DOT start -> recv [style=bold,color=green]
 DOT start -> DONE [label=errors]
@@ -1588,6 +1583,7 @@ cnt_start(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 	AZ(sp->restarts);
 	AZ(wrk->obj);
 	AZ(sp->vcl);
@@ -1684,8 +1680,10 @@ CNT_Session(struct sess *sp)
 	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+#if 0
 	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 	MPL_AssertSane(sp->req);
+#endif
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
@@ -1723,8 +1721,10 @@ CNT_Session(struct sess *sp)
 	 */
 	for (done = 0; !done; ) {
 		assert(sp->wrk == wrk);
+#if 0
 		CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 		MPL_AssertSane(sp->req);
+#endif
 		/*
 		 * This is a good place to be paranoid about the various
 		 * pointers still pointing to the things we expect.
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 1292e5e..530c96e 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -218,9 +218,6 @@ SES_New(struct worker *wrk, struct sesspool *pp)
 	if (sm == NULL)
 		return (NULL);
 	sp = &sm->sess;
-	sp->req = MPL_Get(pp->mpl_req, NULL);
-	AN(sp->req);
-	sp->req->magic = REQ_MAGIC;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	return (sp);
 }
@@ -245,24 +242,33 @@ SES_Alloc(void)
 }
 
 /*--------------------------------------------------------------------
- * Schedule a session back on a work-thread from its pool
  */
 
-int
-SES_Schedule(struct sess *sp)
+static struct sesspool *
+ses_getpool(const struct sess *sp)
 {
 	struct sessmem *sm;
 	struct sesspool *pp;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-
-	AZ(sp->wrk);
-
 	sm = sp->mem;
 	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-
 	pp = sm->pool;
 	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
+	return (pp);
+}
+
+/*--------------------------------------------------------------------
+ * Schedule a session back on a work-thread from its pool
+ */
+
+int
+SES_Schedule(struct sess *sp)
+{
+	struct sesspool *pp;
+
+	pp = ses_getpool(sp);
+	AZ(sp->wrk);
 
 	AN(pp->pool);
 
@@ -330,14 +336,10 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 	struct worker *wrk;
 	struct sesspool *pp;
 
+	pp = ses_getpool(sp);
 
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-	MPL_AssertSane(sp->req);
 	sm = sp->mem;
 	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-	pp = sm->pool;
-	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_ORNULL(wrk, WORKER_MAGIC);
 
@@ -348,6 +350,9 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 	assert(!isnan(sp->t_open));
 	assert(sp->fd < 0);
 
+	if (sp->req != NULL)
+		SES_ReleaseReq(sp);
+
 	AZ(sp->vcl);
 	if (*sp->addr == '\0')
 		strcpy(sp->addr, "-");
@@ -362,11 +367,6 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
 
-	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-	MPL_AssertSane(sp->req);
-	MPL_Free(pp->mpl_req, sp->req);
-	sp->req = NULL;
-
 	if (sm->workspace != cache_param->sess_workspace ||
 	    sm->nhttp != (uint16_t)cache_param->http_max_hdr ||
 	    pp->nsess > cache_param->max_sess) {
@@ -392,45 +392,73 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 }
 
 /*--------------------------------------------------------------------
+ * Alloc/Free/Clean sp->req
+ */
+
+void
+SES_GetReq(struct sess *sp)
+{
+	struct sesspool *pp;
+
+	pp = ses_getpool(sp);
+	AZ(sp->req);
+	sp->req = MPL_Get(pp->mpl_req, NULL);
+	AN(sp->req);
+	sp->req->magic = REQ_MAGIC;
+}
+
+void
+SES_ReleaseReq(struct sess *sp)
+{
+	struct sesspool *pp;
+
+	pp = ses_getpool(sp);
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
+	MPL_AssertSane(sp->req);
+	MPL_Free(pp->mpl_req, sp->req);
+	sp->req = NULL;
+}
+
+/*--------------------------------------------------------------------
  * Create and delete pools
  */
 
 struct sesspool *
-SES_NewPool(struct pool *pp, unsigned pool_no)
+SES_NewPool(struct pool *wp, unsigned pool_no)
 {
-	struct sesspool *sp;
+	struct sesspool *pp;
 	char nb[8];
 
-	ALLOC_OBJ(sp, SESSPOOL_MAGIC);
-	AN(sp);
-	sp->pool = pp;
-	VTAILQ_INIT(&sp->freelist);
-	Lck_New(&sp->mtx, lck_sessmem);
+	ALLOC_OBJ(pp, SESSPOOL_MAGIC);
+	AN(pp);
+	pp->pool = wp;
+	VTAILQ_INIT(&pp->freelist);
+	Lck_New(&pp->mtx, lck_sessmem);
 	bprintf(nb, "req%u", pool_no);
-	sp->req_size = sizeof (struct req);
-	sp->mpl_req = MPL_New(nb, &cache_param->req_pool, &sp->req_size);
-	return (sp);
+	pp->req_size = sizeof (struct req);
+	pp->mpl_req = MPL_New(nb, &cache_param->req_pool, &pp->req_size);
+	return (pp);
 }
 
 void
-SES_DeletePool(struct sesspool *sp, struct worker *wrk)
+SES_DeletePool(struct sesspool *pp, struct worker *wrk)
 {
 	struct sessmem *sm;
 
-	CHECK_OBJ_NOTNULL(sp, SESSPOOL_MAGIC);
+	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	Lck_Lock(&sp->mtx);
-	while (!VTAILQ_EMPTY(&sp->freelist)) {
-		sm = VTAILQ_FIRST(&sp->freelist);
+	Lck_Lock(&pp->mtx);
+	while (!VTAILQ_EMPTY(&pp->freelist)) {
+		sm = VTAILQ_FIRST(&pp->freelist);
 		CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-		VTAILQ_REMOVE(&sp->freelist, sm, list);
+		VTAILQ_REMOVE(&pp->freelist, sm, list);
 		FREE_OBJ(sm);
 		wrk->stats.sessmem_free++;
-		sp->nsess--;
+		pp->nsess--;
 	}
-	AZ(sp->nsess);
-	Lck_Unlock(&sp->mtx);
-	Lck_Delete(&sp->mtx);
-	MPL_Destroy(&sp->mpl_req);
-	FREE_OBJ(sp);
+	AZ(pp->nsess);
+	Lck_Unlock(&pp->mtx);
+	Lck_Delete(&pp->mtx);
+	MPL_Destroy(&pp->mpl_req);
+	FREE_OBJ(pp);
 }
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 8aa8684..44e9721 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -68,6 +68,7 @@ WAIT_Enter(struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
+	AZ(sp->req);
 	AZ(sp->vcl);
 	assert(sp->fd >= 0);
 	sp->wrk = NULL;



From phk at varnish-cache.org  Fri Dec 23 09:22:01 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 10:22:01 +0100
Subject: [master] f7ef385 Longer delays
Message-ID: <E1Re1KD-0002YC-5u@project.varnish-software.com>

commit f7ef385a7a708b35164f4eaa64ab4aa1e10f2a46
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 09:21:52 2011 +0000

    Longer delays

diff --git a/bin/varnishtest/tests/c00050.vtc b/bin/varnishtest/tests/c00050.vtc
index 04d8f2c..2e787cb 100644
--- a/bin/varnishtest/tests/c00050.vtc
+++ b/bin/varnishtest/tests/c00050.vtc
@@ -4,26 +4,26 @@ server s1 { } -start
 
 varnish v1 -vcl+backend {} -start
 
-delay 1
+delay 2
 
 varnish v1 -expect MEMPOOL.vbc.pool == 10
 
 varnish v1 -cliok "param.set pool_vbc 90,100,100"
 
-delay 1
+delay 2
 
 varnish v1 -expect MEMPOOL.vbc.pool == 90
 
 varnish v1 -cliok "param.set pool_vbc 50,80,100"
 
-delay 1
+delay 2
 
 varnish v1 -expect MEMPOOL.vbc.pool == 80
 varnish v1 -expect MEMPOOL.vbc.surplus == 10
 
 varnish v1 -cliok "param.set pool_vbc 10,80,1"
 
-delay 1
+delay 2
 
 varnish v1 -expect MEMPOOL.vbc.pool == 10
 varnish v1 -expect MEMPOOL.vbc.timeout == 70



From phk at varnish-cache.org  Fri Dec 23 11:48:48 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 12:48:48 +0100
Subject: [master] 9173a98 Move xid from sess to req
Message-ID: <E1Re3cG-0008Uu-RA@project.varnish-software.com>

commit 9173a98a9f63de2fa47b04e8eb0094f4e5029ee6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 11:48:11 2011 +0000

    Move xid from sess to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 3c37176..f45235b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -580,6 +580,8 @@ struct object {
 struct req {
 	unsigned		magic;
 #define REQ_MAGIC		0x2751aaa1
+
+	unsigned		xid;
 };
 
 /*--------------------------------------------------------------------*/
@@ -625,7 +627,6 @@ struct sess {
 
 	/* Request related fields ------------------------------------*/
 
-	unsigned		xid;
 
 	int			restarts;
 	int			esi_level;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index a119360..1de6ed7 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -113,7 +113,7 @@ cnt_wait(struct sess *sp)
 	AZ(sp->vcl);
 	AZ(wrk->obj);
 	AZ(sp->esi_level);
-	assert(sp->xid == 0);
+	assert(sp->req->xid == 0);
 
 	assert(!isnan(sp->t_req));
 	tmo = (int)(1e3 * cache_param->timeout_linger);
@@ -397,7 +397,7 @@ cnt_done(struct sess *sp)
 
 
 	sp->t_idle = W_TIM_real(wrk);
-	if (sp->xid == 0) {
+	if (sp->req->xid == 0) {
 		sp->t_resp = sp->t_idle;
 	} else {
 		dp = sp->t_resp - sp->t_req;
@@ -410,9 +410,9 @@ cnt_done(struct sess *sp)
 			    (uintmax_t)sp->req_bodybytes);
 		}
 		WSP(sp, SLT_ReqEnd, "%u %.9f %.9f %.9f %.9f %.9f",
-		    sp->xid, sp->t_req, sp->t_idle, dh, dp, da);
+		    sp->req->xid, sp->t_req, sp->t_idle, dh, dp, da);
 	}
-	sp->xid = 0;
+	sp->req->xid = 0;
 	WSL_Flush(wrk, 0);
 
 	sp->t_req = NAN;
@@ -503,7 +503,7 @@ cnt_error(struct sess *sp)
 			return(0);
 		}
 		AN(wrk->obj);
-		wrk->obj->xid = sp->xid;
+		wrk->obj->xid = sp->req->xid;
 		wrk->obj->exp.entered = sp->t_req;
 	} else {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -869,7 +869,7 @@ cnt_fetchbody(struct sess *sp)
 		VSB_delete(vary);
 	}
 
-	wrk->obj->xid = sp->xid;
+	wrk->obj->xid = sp->req->xid;
 	wrk->obj->response = sp->err_code;
 	WS_Assert(wrk->obj->ws_o);
 
@@ -1035,7 +1035,7 @@ cnt_first(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-	assert(sp->xid == 0);
+	AZ(sp->req);
 	assert(sp->restarts == 0);
 	AZ(sp->esi_level);
 
@@ -1595,8 +1595,8 @@ cnt_start(struct sess *sp)
 	wrk->acct_tmp.req++;
 
 	/* Assign XID and log */
-	sp->xid = ++xids;				/* XXX not locked */
-	WSP(sp, SLT_ReqStart, "%s %s %u", sp->addr, sp->port,  sp->xid);
+	sp->req->xid = ++xids;				/* XXX not locked */
+	WSP(sp, SLT_ReqStart, "%s %s %u", sp->addr, sp->port,  sp->req->xid);
 
 	/* Borrow VCL reference from worker thread */
 	VCL_Refresh(&wrk->vcl);
diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index 98d89c3..abb9e43 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -132,6 +132,7 @@ cli_debug_sizeof(struct cli *cli, const char * const *av, void *priv)
 	SZOF(struct objcore);
 	SZOF(struct objhead);
 	SZOF(struct sess);
+	SZOF(struct req);
 	SZOF(struct vbc);
 	SZOF(struct VSC_C_main);
 	SZOF(struct lock);
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index e961819..fb0771d 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -91,7 +91,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	/* Client content already taken care of */
 	http_Unset(sp->http, H_Content_Length);
 
-	sxid = sp->xid;
+	sxid = sp->req->xid;
 	while (1) {
 		sp->wrk = w;
 		CNT_Session(sp);
@@ -102,7 +102,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 		DSL(0x20, SLT_Debug, sp->vsl_id, "loop waiting for ESI");
 		(void)usleep(10000);
 	}
-	sp->xid = sxid;
+	sp->req->xid = sxid;
 	AN(sp->wrk);
 	assert(sp->step == STP_DONE);
 	sp->esi_level--;
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 4a6ba82..803fed2 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -880,7 +880,7 @@ http_FilterHeader(const struct sess *sp, unsigned how)
 	else
 		http_copyh(hp, sp->http, HTTP_HDR_PROTO);
 	http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->http, how);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->xid);
+	http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->req->xid);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 6daf807..238c597 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -235,7 +235,7 @@ pan_sess(const struct sess *sp)
 	VSB_printf(pan_vsp, "sp = %p {\n", sp);
 	VSB_printf(pan_vsp,
 	    "  fd = %d, id = %u, xid = %u,\n",
-	    sp->fd, sp->vsl_id & VSL_IDENTMASK, sp->xid);
+	    sp->fd, sp->vsl_id & VSL_IDENTMASK, sp->req->xid);
 	VSB_printf(pan_vsp, "  client = %s %s,\n",
 	    sp->addr ? sp->addr : "?.?.?.?",
 	    sp->port ? sp->port : "?");
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 43feae9..cbddb7d 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -132,12 +132,12 @@ RES_BuildHttp(const struct sess *sp)
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
 	    "Date: %s", time_str);
 
-	if (sp->xid != sp->wrk->obj->xid)
+	if (sp->req->xid != sp->wrk->obj->xid)
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
-		    "X-Varnish: %u %u", sp->xid, sp->wrk->obj->xid);
+		    "X-Varnish: %u %u", sp->req->xid, sp->wrk->obj->xid);
 	else
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
-		    "X-Varnish: %u", sp->xid);
+		    "X-Varnish: %u", sp->req->xid);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
 	    sp->wrk->obj->exp.age + sp->t_resp - sp->wrk->obj->exp.entered);
 	http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 6e7efea..2878d9a 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -169,7 +169,7 @@ RFC2616_Ttl(const struct sess *sp)
 	/* calculated TTL, Our time, Date, Expires, max-age, age */
 	WSP(sp, SLT_TTL,
 	    "%u RFC %.0f %.0f %.0f %.0f %.0f %.0f %.0f %u",
-	    sp->xid, expp->ttl, -1., -1., expp->entered,
+	    sp->req->xid, expp->ttl, -1., -1., expp->entered,
 	    expp->age, h_date, h_expires, max_age);
 }
 
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 7431c1b..6f5544b 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -416,11 +416,11 @@ VRT_DO_EXP(obj, sp->wrk->obj->exp, keep, 0,
    vrt_wsp_exp(sp, sp->wrk->obj->xid, &sp->wrk->obj->exp);)
 
 VRT_DO_EXP(beresp, sp->wrk->busyobj->exp, grace, 0,
-   vrt_wsp_exp(sp, sp->xid, &sp->wrk->busyobj->exp);)
+   vrt_wsp_exp(sp, sp->req->xid, &sp->wrk->busyobj->exp);)
 VRT_DO_EXP(beresp, sp->wrk->busyobj->exp, ttl, 0,
-   vrt_wsp_exp(sp, sp->xid, &sp->wrk->busyobj->exp);)
+   vrt_wsp_exp(sp, sp->req->xid, &sp->wrk->busyobj->exp);)
 VRT_DO_EXP(beresp, sp->wrk->busyobj->exp, keep, 0,
-   vrt_wsp_exp(sp, sp->xid, &sp->wrk->busyobj->exp);)
+   vrt_wsp_exp(sp, sp->req->xid, &sp->wrk->busyobj->exp);)
 
 /*--------------------------------------------------------------------
  * req.xid
@@ -433,9 +433,9 @@ VRT_r_req_xid(struct sess *sp)
 	int size;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
-	size = snprintf(NULL, 0, "%u", sp->xid) + 1;
+	size = snprintf(NULL, 0, "%u", sp->req->xid) + 1;
 	AN(p = WS_Alloc(sp->http->ws, size));
-	assert(snprintf(p, size, "%u", sp->xid) < size);
+	assert(snprintf(p, size, "%u", sp->req->xid) < size);
 	return (p);
 }
 



From phk at varnish-cache.org  Fri Dec 23 12:16:12 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 13:16:12 +0100
Subject: [master] 097e646 Move another 144 bytes from sess to req
Message-ID: <E1Re42m-0005fR-S0@project.varnish-software.com>

commit 097e646a65fc157751f93bbd24005eaa1e34d160
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 12:15:35 2011 +0000

    Move another 144 bytes from sess to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index f45235b..1b2f1a7 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -582,6 +582,29 @@ struct req {
 #define REQ_MAGIC		0x2751aaa1
 
 	unsigned		xid;
+	int			restarts;
+	int			esi_level;
+	int			disable_esi;
+	uint8_t			hash_ignore_busy;
+	uint8_t			hash_always_miss;
+
+	/* The busy objhead we sleep on */
+	struct objhead		*hash_objhead;
+
+	/* Built Vary string */
+	uint8_t			*vary_b;
+	uint8_t			*vary_l;
+	uint8_t			*vary_e;
+
+	unsigned char		digest[DIGEST_LEN];
+
+	const char		*doclose;
+	struct exp		exp;
+	unsigned		cur_method;
+	unsigned		handling;
+	unsigned char		sendbody;
+	unsigned char		wantbody;
+
 };
 
 /*--------------------------------------------------------------------*/
@@ -624,46 +647,20 @@ struct sess {
 #if defined(HAVE_EPOLL_CTL)
 	struct epoll_event ev;
 #endif
+	enum step		step;
 
 	/* Request related fields ------------------------------------*/
 
-
-	int			restarts;
-	int			esi_level;
-	int			disable_esi;
-
-	uint8_t			hash_ignore_busy;
-	uint8_t			hash_always_miss;
-
 	/* HTTP request */
-	const char		*doclose;
 	struct http		*http;
 	struct http		*http0;
 
 	struct ws		ws[1];
 	char			*ws_req;	/* WS above request data */
 
-	unsigned char		digest[DIGEST_LEN];
-
-	/* Built Vary string */
-	uint8_t			*vary_b;
-	uint8_t			*vary_l;
-	uint8_t			*vary_e;
-
-	/* Acceptable grace period */
-	struct exp		exp;
-
-	enum step		step;
-	unsigned		cur_method;
-	unsigned		handling;
-	unsigned char		sendbody;
-	unsigned char		wantbody;
 	uint16_t		err_code;
 	const char		*err_reason;
 
-	/* The busy objhead we sleep on */
-	struct objhead		*hash_objhead;
-
 	struct director		*director;
 	struct VCL_conf		*vcl;
 
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 1de6ed7..cb5d161 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -112,7 +112,7 @@ cnt_wait(struct sess *sp)
 
 	AZ(sp->vcl);
 	AZ(wrk->obj);
-	AZ(sp->esi_level);
+	AZ(sp->req->esi_level);
 	assert(sp->req->xid == 0);
 
 	assert(!isnan(sp->t_req));
@@ -229,13 +229,13 @@ cnt_prepresp(struct sess *sp)
 	    !wrk->busyobj->do_gzip && !wrk->busyobj->do_gunzip)
 		wrk->res_mode |= RES_LEN;
 
-	if (!sp->disable_esi && wrk->obj->esidata != NULL) {
+	if (!sp->req->disable_esi && wrk->obj->esidata != NULL) {
 		/* In ESI mode, we don't know the aggregate length */
 		wrk->res_mode &= ~RES_LEN;
 		wrk->res_mode |= RES_ESI;
 	}
 
-	if (sp->esi_level > 0) {
+	if (sp->req->esi_level > 0) {
 		wrk->res_mode &= ~RES_LEN;
 		wrk->res_mode |= RES_ESI_CHILD;
 	}
@@ -258,13 +258,13 @@ cnt_prepresp(struct sess *sp)
 			 * can make it any different size
 			 */
 			wrk->res_mode |= RES_LEN;
-		else if (!sp->wantbody) {
+		else if (!sp->req->wantbody) {
 			/* Nothing */
 		} else if (sp->http->protover >= 11) {
 			wrk->res_mode |= RES_CHUNKED;
 		} else {
 			wrk->res_mode |= RES_EOF;
-			sp->doclose = "EOF mode";
+			sp->req->doclose = "EOF mode";
 		}
 	}
 
@@ -279,11 +279,11 @@ cnt_prepresp(struct sess *sp)
 	http_Setup(wrk->resp, wrk->ws);
 	RES_BuildHttp(sp);
 	VCL_deliver_method(sp);
-	switch (sp->handling) {
+	switch (sp->req->handling) {
 	case VCL_RET_DELIVER:
 		break;
 	case VCL_RET_RESTART:
-		if (sp->restarts >= cache_param->max_restarts)
+		if (sp->req->restarts >= cache_param->max_restarts)
 			break;
 		if (wrk->busyobj != NULL) {
 			AN(wrk->busyobj->do_stream);
@@ -294,7 +294,7 @@ cnt_prepresp(struct sess *sp)
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
 		}
 		AZ(wrk->obj);
-		sp->restarts++;
+		sp->req->restarts++;
 		sp->director = NULL;
 		http_Setup(wrk->resp, NULL);
 		sp->step = STP_RECV;
@@ -337,7 +337,7 @@ cnt_deliver(struct sess *sp)
 
 	AZ(sp->wrk->busyobj);
 	sp->director = NULL;
-	sp->restarts = 0;
+	sp->req->restarts = 0;
 
 	RES_WriteObj(sp);
 
@@ -378,14 +378,14 @@ cnt_done(struct sess *sp)
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 	sp->director = NULL;
-	sp->restarts = 0;
+	sp->req->restarts = 0;
 
 	wrk->busyobj = NULL;
 
 	SES_Charge(sp);
 
 	/* If we did an ESI include, don't mess up our state */
-	if (sp->esi_level > 0)
+	if (sp->req->esi_level > 0)
 		return (1);
 
 	if (sp->vcl != NULL) {
@@ -420,16 +420,16 @@ cnt_done(struct sess *sp)
 
 	sp->req_bodybytes = 0;
 
-	sp->hash_always_miss = 0;
-	sp->hash_ignore_busy = 0;
+	sp->req->hash_always_miss = 0;
+	sp->req->hash_ignore_busy = 0;
 
-	if (sp->fd >= 0 && sp->doclose != NULL) {
+	if (sp->fd >= 0 && sp->req->doclose != NULL) {
 		/*
 		 * This is an orderly close of the connection; ditch nolinger
 		 * before we close, to get queued data transmitted.
 		 */
 		// XXX: not yet (void)VTCP_linger(sp->fd, 0);
-		SES_Close(sp, sp->doclose);
+		SES_Close(sp, sp->req->doclose);
 	}
 
 	if (sp->fd < 0) {
@@ -495,7 +495,7 @@ cnt_error(struct sess *sp)
 			    cache_param->http_resp_size,
 			    (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL) {
-			sp->doclose = "Out of objects";
+			sp->req->doclose = "Out of objects";
 			sp->director = NULL;
 			http_Setup(wrk->busyobj->beresp, NULL);
 			http_Setup(wrk->busyobj->bereq, NULL);
@@ -528,23 +528,23 @@ cnt_error(struct sess *sp)
 		    http_StatusMessage(sp->err_code));
 	VCL_error_method(sp);
 
-	if (sp->handling == VCL_RET_RESTART &&
-	    sp->restarts <  cache_param->max_restarts) {
+	if (sp->req->handling == VCL_RET_RESTART &&
+	    sp->req->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->director = NULL;
-		sp->restarts++;
+		sp->req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
-	} else if (sp->handling == VCL_RET_RESTART)
-		sp->handling = VCL_RET_DELIVER;
+	} else if (sp->req->handling == VCL_RET_RESTART)
+		sp->req->handling = VCL_RET_DELIVER;
 
 
 	/* We always close when we take this path */
-	sp->doclose = "error";
-	sp->wantbody = 1;
+	sp->req->doclose = "error";
+	sp->req->wantbody = 1;
 
-	assert(sp->handling == VCL_RET_DELIVER);
+	assert(sp->req->handling == VCL_RET_DELIVER);
 	sp->err_code = 0;
 	sp->err_reason = NULL;
 	http_Setup(wrk->busyobj->bereq, NULL);
@@ -616,7 +616,7 @@ cnt_fetch(struct sess *sp)
 	}
 
 	if (i) {
-		sp->handling = VCL_RET_ERROR;
+		sp->req->handling = VCL_RET_ERROR;
 		sp->err_code = 503;
 	} else {
 		/*
@@ -651,7 +651,7 @@ cnt_fetch(struct sess *sp)
 
 		VCL_fetch_method(sp);
 
-		switch (sp->handling) {
+		switch (sp->req->handling) {
 		case VCL_RET_HIT_FOR_PASS:
 			if (wrk->objcore != NULL)
 				wrk->objcore->flags |= OC_F_PASS;
@@ -681,9 +681,9 @@ cnt_fetch(struct sess *sp)
 	sp->director = NULL;
 	wrk->storage_hint = NULL;
 
-	switch (sp->handling) {
+	switch (sp->req->handling) {
 	case VCL_RET_RESTART:
-		sp->restarts++;
+		sp->req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
 	case VCL_RET_ERROR:
@@ -732,15 +732,15 @@ cnt_fetchbody(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
-	assert(sp->handling == VCL_RET_HIT_FOR_PASS ||
-	    sp->handling == VCL_RET_DELIVER);
+	assert(sp->req->handling == VCL_RET_HIT_FOR_PASS ||
+	    sp->req->handling == VCL_RET_DELIVER);
 
 	if (wrk->objcore == NULL) {
 		/* This is a pass from vcl_recv */
 		pass = 1;
 		/* VCL may have fiddled this, but that doesn't help */
 		wrk->busyobj->exp.ttl = -1.;
-	} else if (sp->handling == VCL_RET_HIT_FOR_PASS) {
+	} else if (sp->req->handling == VCL_RET_HIT_FOR_PASS) {
 		/* pass from vcl_fetch{} -> hit-for-pass */
 		/* XXX: the bereq was not filtered pass... */
 		pass = 1;
@@ -805,9 +805,9 @@ cnt_fetchbody(struct sess *sp)
 	else if (wrk->busyobj->is_gzip)
 		wrk->busyobj->vfp = &vfp_testgzip;
 
-	if (wrk->busyobj->do_esi || sp->esi_level > 0)
+	if (wrk->busyobj->do_esi || sp->req->esi_level > 0)
 		wrk->busyobj->do_stream = 0;
-	if (!sp->wantbody)
+	if (!sp->req->wantbody)
 		wrk->busyobj->do_stream = 0;
 
 	l = http_EstimateWS(wrk->busyobj->beresp,
@@ -992,11 +992,11 @@ cnt_streambody(struct sess *sp)
 		AN(wrk->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	} else {
-		sp->doclose = "Stream error";
+		sp->req->doclose = "Stream error";
 	}
 	wrk->acct_tmp.fetch++;
 	sp->director = NULL;
-	sp->restarts = 0;
+	sp->req->restarts = 0;
 
 	RES_StreamEnd(sp);
 	if (wrk->res_mode & RES_GUNZIP)
@@ -1036,8 +1036,6 @@ cnt_first(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	AZ(sp->req);
-	assert(sp->restarts == 0);
-	AZ(sp->esi_level);
 
 	VTCP_name(&sp->sockaddr, sp->sockaddrlen,
 	    sp->addr, sizeof sp->addr, sp->port, sizeof sp->port);
@@ -1098,7 +1096,7 @@ cnt_hit(struct sess *sp)
 
 	VCL_hit_method(sp);
 
-	if (sp->handling == VCL_RET_DELIVER) {
+	if (sp->req->handling == VCL_RET_DELIVER) {
 		/* Dispose of any body part of the request */
 		(void)FetchReqBody(sp);
 		//AZ(wrk->busyobj->bereq->ws);
@@ -1111,7 +1109,7 @@ cnt_hit(struct sess *sp)
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
 	wrk->objcore = NULL;
 
-	switch(sp->handling) {
+	switch(sp->req->handling) {
 	case VCL_RET_PASS:
 		sp->step = STP_PASS;
 		return (0);
@@ -1120,7 +1118,7 @@ cnt_hit(struct sess *sp)
 		return (0);
 	case VCL_RET_RESTART:
 		sp->director = NULL;
-		sp->restarts++;
+		sp->req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
 	default:
@@ -1171,18 +1169,18 @@ cnt_lookup(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
-	if (sp->hash_objhead == NULL) {
+	if (sp->req->hash_objhead == NULL) {
 		/* Not a waiting list return */
-		AZ(sp->vary_b);
-		AZ(sp->vary_l);
-		AZ(sp->vary_e);
+		AZ(sp->req->vary_b);
+		AZ(sp->req->vary_l);
+		AZ(sp->req->vary_e);
 		(void)WS_Reserve(sp->ws, 0);
 	} else {
 		AN(sp->ws->r);
 	}
-	sp->vary_b = (void*)sp->ws->f;
-	sp->vary_e = (void*)sp->ws->r;
-	sp->vary_b[2] = '\0';
+	sp->req->vary_b = (void*)sp->ws->f;
+	sp->req->vary_e = (void*)sp->ws->r;
+	sp->req->vary_b[2] = '\0';
 
 	oc = HSH_Lookup(sp, &oh);
 
@@ -1204,17 +1202,17 @@ cnt_lookup(struct sess *sp)
 	if (oc->flags & OC_F_BUSY) {
 		wrk->stats.cache_miss++;
 
-		if (sp->vary_l != NULL) {
-			assert(oc->busyobj->vary == sp->vary_b);
+		if (sp->req->vary_l != NULL) {
+			assert(oc->busyobj->vary == sp->req->vary_b);
 			VRY_Validate(oc->busyobj->vary);
-			WS_ReleaseP(sp->ws, (void*)sp->vary_l);
+			WS_ReleaseP(sp->ws, (void*)sp->req->vary_l);
 		} else {
 			AZ(oc->busyobj->vary);
 			WS_Release(sp->ws, 0);
 		}
-		sp->vary_b = NULL;
-		sp->vary_l = NULL;
-		sp->vary_e = NULL;
+		sp->req->vary_b = NULL;
+		sp->req->vary_l = NULL;
+		sp->req->vary_e = NULL;
 
 		wrk->objcore = oc;
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -1227,9 +1225,9 @@ cnt_lookup(struct sess *sp)
 	wrk->obj = o;
 
 	WS_Release(sp->ws, 0);
-	sp->vary_b = NULL;
-	sp->vary_l = NULL;
-	sp->vary_e = NULL;
+	sp->req->vary_b = NULL;
+	sp->req->vary_l = NULL;
+	sp->req->vary_e = NULL;
 
 	if (oc->flags & OC_F_PASS) {
 		wrk->stats.cache_hitpass++;
@@ -1303,7 +1301,7 @@ cnt_miss(struct sess *sp)
 
 	VCL_miss_method(sp);
 
-	switch(sp->handling) {
+	switch(sp->req->handling) {
 	case VCL_RET_ERROR:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
@@ -1385,15 +1383,15 @@ cnt_pass(struct sess *sp)
 	wrk->first_byte_timeout = 0;
 	wrk->between_bytes_timeout = 0;
 	VCL_pass_method(sp);
-	if (sp->handling == VCL_RET_ERROR) {
+	if (sp->req->handling == VCL_RET_ERROR) {
 		http_Setup(wrk->busyobj->bereq, NULL);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	}
-	assert(sp->handling == VCL_RET_PASS);
+	assert(sp->req->handling == VCL_RET_PASS);
 	wrk->acct_tmp.pass++;
-	sp->sendbody = 1;
+	sp->req->sendbody = 1;
 	sp->step = STP_FETCH;
 	return (0);
 }
@@ -1443,9 +1441,9 @@ cnt_pipe(struct sess *sp)
 
 	VCL_pipe_method(sp);
 
-	if (sp->handling == VCL_RET_ERROR)
+	if (sp->req->handling == VCL_RET_ERROR)
 		INCOMPL();
-	assert(sp->handling == VCL_RET_PIPE);
+	assert(sp->req->handling == VCL_RET_PIPE);
 
 	PipeSession(sp);
 	assert(WRW_IsReleased(wrk));
@@ -1494,17 +1492,17 @@ cnt_recv(struct sess *sp)
 	sp->director = sp->vcl->director[0];
 	AN(sp->director);
 
-	sp->disable_esi = 0;
-	sp->hash_always_miss = 0;
-	sp->hash_ignore_busy = 0;
+	sp->req->disable_esi = 0;
+	sp->req->hash_always_miss = 0;
+	sp->req->hash_ignore_busy = 0;
 	sp->client_identity = NULL;
 
 	http_CollectHdr(sp->http, H_Cache_Control);
 
 	VCL_recv_method(sp);
-	recv_handling = sp->handling;
+	recv_handling = sp->req->handling;
 
-	if (sp->restarts >= cache_param->max_restarts) {
+	if (sp->req->restarts >= cache_param->max_restarts) {
 		if (sp->err_code == 0)
 			sp->err_code = 503;
 		sp->step = STP_ERROR;
@@ -1525,22 +1523,22 @@ cnt_recv(struct sess *sp)
 
 	SHA256_Init(wrk->sha256ctx);
 	VCL_hash_method(sp);
-	assert(sp->handling == VCL_RET_HASH);
-	SHA256_Final(sp->digest, wrk->sha256ctx);
+	assert(sp->req->handling == VCL_RET_HASH);
+	SHA256_Final(sp->req->digest, wrk->sha256ctx);
 
 	if (!strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD"))
-		sp->wantbody = 0;
+		sp->req->wantbody = 0;
 	else
-		sp->wantbody = 1;
+		sp->req->wantbody = 1;
 
-	sp->sendbody = 0;
+	sp->req->sendbody = 0;
 	switch(recv_handling) {
 	case VCL_RET_LOOKUP:
 		/* XXX: discard req body, if any */
 		sp->step = STP_LOOKUP;
 		return (0);
 	case VCL_RET_PIPE:
-		if (sp->esi_level > 0) {
+		if (sp->req->esi_level > 0) {
 			/* XXX: VSL something */
 			INCOMPL();
 			/* sp->step = STP_DONE; */
@@ -1584,10 +1582,11 @@ cnt_start(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-	AZ(sp->restarts);
+	AZ(sp->req->restarts);
 	AZ(wrk->obj);
 	AZ(sp->vcl);
-	AZ(sp->esi_level);
+	EXP_Clr(&sp->req->exp);
+	AZ(sp->req->esi_level);
 
 	/* Update stats of various sorts */
 	wrk->stats.client_req++;
@@ -1625,7 +1624,7 @@ cnt_start(struct sess *sp)
 		return (0);
 	}
 
-	sp->doclose = http_DoConnection(sp->http);
+	sp->req->doclose = http_DoConnection(sp->http);
 
 	/* XXX: Handle TRACE & OPTIONS of Max-Forwards = 0 */
 
diff --git a/bin/varnishd/cache/cache_dir_random.c b/bin/varnishd/cache/cache_dir_random.c
index d6570ed..28a079c 100644
--- a/bin/varnishd/cache/cache_dir_random.c
+++ b/bin/varnishd/cache/cache_dir_random.c
@@ -112,8 +112,8 @@ vdi_random_init_seed(const struct vdi_random *vs, const struct sess *sp)
 		retval = vdi_random_sha(p, strlen(p));
 		break;
 	case c_hash:
-		AN(sp->digest);
-		retval = scalbn(vle32dec(sp->digest), -32);
+		AN(sp->req->digest);
+		retval = scalbn(vle32dec(sp->req->digest), -32);
 		break;
 	case c_random:
 	default:
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index fb0771d..36ff704 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -52,9 +52,9 @@ ved_include(struct sess *sp, const char *src, const char *host)
 
 	w = sp->wrk;
 
-	if (sp->esi_level >= cache_param->max_esi_depth)
+	if (sp->req->esi_level >= cache_param->max_esi_depth)
 		return;
-	sp->esi_level++;
+	sp->req->esi_level++;
 
 	(void)WRW_FlushRelease(w);
 
@@ -105,7 +105,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	sp->req->xid = sxid;
 	AN(sp->wrk);
 	assert(sp->step == STP_DONE);
-	sp->esi_level--;
+	sp->req->esi_level--;
 	sp->wrk->obj = obj;
 	sp->wrk->res_mode = res_mode;
 
@@ -247,7 +247,7 @@ ESI_Deliver(struct sess *sp)
 		isgzip = 0;
 	}
 
-	if (sp->esi_level == 0) {
+	if (sp->req->esi_level == 0) {
 		/*
 		 * Only the top level document gets to decide this.
 		 */
@@ -403,7 +403,7 @@ ESI_Deliver(struct sess *sp)
 			(void)WRW_Write(sp->wrk, obuf, obufl);
 		(void)VGZ_Destroy(&vgz, sp->vsl_id);
 	}
-	if (sp->wrk->gzip_resp && sp->esi_level == 0) {
+	if (sp->wrk->gzip_resp && sp->req->esi_level == 0) {
 		/* Emit a gzip literal block with finish bit set */
 		tailbuf[0] = 0x01;
 		tailbuf[1] = 0x00;
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 761a62e..e93a1aa 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -116,8 +116,8 @@ EXP_Keep(const struct sess *sp, const struct object *o)
 	r = (double)cache_param->default_keep;
 	if (o->exp.keep > 0.)
 		r = o->exp.keep;
-	if (sp != NULL && sp->exp.keep > 0. && sp->exp.keep < r)
-		r = sp->exp.keep;
+	if (sp != NULL && sp->req->exp.keep > 0. && sp->req->exp.keep < r)
+		r = sp->req->exp.keep;
 	return (EXP_Ttl(sp, o) + r);
 }
 
@@ -129,8 +129,8 @@ EXP_Grace(const struct sess *sp, const struct object *o)
 	r = (double)cache_param->default_grace;
 	if (o->exp.grace >= 0.)
 		r = o->exp.grace;
-	if (sp != NULL && sp->exp.grace > 0. && sp->exp.grace < r)
-		r = sp->exp.grace;
+	if (sp != NULL && sp->req->exp.grace > 0. && sp->req->exp.grace < r)
+		r = sp->req->exp.grace;
 	return (EXP_Ttl(sp, o) + r);
 }
 
@@ -140,8 +140,8 @@ EXP_Ttl(const struct sess *sp, const struct object *o)
 	double r;
 
 	r = o->exp.ttl;
-	if (sp != NULL && sp->exp.ttl > 0. && sp->exp.ttl < r)
-		r = sp->exp.ttl;
+	if (sp != NULL && sp->req->exp.ttl > 0. && sp->req->exp.ttl < r)
+		r = sp->req->exp.ttl;
 	return (o->exp.entered + r);
 }
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 936dc30..79d0665 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -349,7 +349,7 @@ FetchReqBody(struct sess *sp)
 			if (rdcnt <= 0)
 				return (1);
 			content_length -= rdcnt;
-			if (!sp->sendbody)
+			if (!sp->req->sendbody)
 				continue;
 			(void)WRW_Write(sp->wrk, buf, rdcnt); /* XXX: stats ? */
 			if (WRW_Flush(sp->wrk))
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 6f6a85f..627db48 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -262,7 +262,7 @@ HSH_Insert(const struct sess *sp)
 	if (cache_param->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
 
-	AZ(sp->hash_objhead);
+	AZ(sp->req);
 	AN(wrk->nobjhead);
 	oh = hash->lookup(sp, wrk->nobjhead);
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
@@ -307,18 +307,18 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	wrk = sp->wrk;
 
 	HSH_Prealloc(sp);
-	memcpy(sp->wrk->nobjhead->digest, sp->digest, sizeof sp->digest);
+	memcpy(sp->wrk->nobjhead->digest, sp->req->digest, sizeof sp->req->digest);
 	if (cache_param->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
 
-	if (sp->hash_objhead != NULL) {
+	if (sp->req->hash_objhead != NULL) {
 		/*
 		 * This sess came off the waiting list, and brings a
 		 * oh refcnt with it.
 		 */
-		CHECK_OBJ_NOTNULL(sp->hash_objhead, OBJHEAD_MAGIC);
-		oh = sp->hash_objhead;
-		sp->hash_objhead = NULL;
+		CHECK_OBJ_NOTNULL(sp->req->hash_objhead, OBJHEAD_MAGIC);
+		oh = sp->req->hash_objhead;
+		sp->req->hash_objhead = NULL;
 	} else {
 		AN(wrk->nobjhead);
 		oh = hash->lookup(sp, wrk->nobjhead);
@@ -340,7 +340,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 
 		if (oc->flags & OC_F_BUSY) {
 			CHECK_OBJ_NOTNULL(oc->busyobj, BUSYOBJ_MAGIC);
-			if (sp->hash_ignore_busy)
+			if (sp->req->hash_ignore_busy)
 				continue;
 
 			if (oc->busyobj->vary != NULL &&
@@ -401,7 +401,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	}
 	sp->wrk->objcore = NULL;
 
-	if (oc != NULL && !sp->hash_always_miss) {
+	if (oc != NULL && !sp->req->hash_always_miss) {
 		o = oc_getobj(sp->wrk, oc);
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 		assert(oc->objhead == oh);
@@ -419,7 +419,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 
 	if (busy_oc != NULL) {
 		/* There are one or more busy objects, wait for them */
-		if (sp->esi_level == 0) {
+		if (sp->req->esi_level == 0) {
 			CHECK_OBJ_NOTNULL(sp->wrk->nwaitinglist,
 			    WAITINGLIST_MAGIC);
 			if (oh->waitinglist == NULL) {
@@ -437,7 +437,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 		 * back when the sess comes off the waiting list and
 		 * calls us again
 		 */
-		sp->hash_objhead = oh;
+		sp->req->hash_objhead = oh;
 		sp->wrk = NULL;
 		Lck_Unlock(&oh->mtx);
 		return (NULL);
@@ -452,9 +452,9 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	AZ(wrk->busyobj);
 	wrk->busyobj = VBO_GetBusyObj(wrk);
 
-	VRY_Validate(sp->vary_b);
-	if (sp->vary_l != NULL)
-		wrk->busyobj->vary = sp->vary_b;
+	VRY_Validate(sp->req->vary_b);
+	if (sp->req->vary_l != NULL)
+		wrk->busyobj->vary = sp->req->vary_b;
 	else
 		wrk->busyobj->vary = NULL;
 	oc->busyobj = wrk->busyobj;
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 238c597..44c8fc3 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -245,7 +245,7 @@ pan_sess(const struct sess *sp)
 #undef STEP
 		default: stp = NULL;
 	}
-	hand = VCL_Return_Name(sp->handling);
+	hand = VCL_Return_Name(sp->req->handling);
 	if (stp != NULL)
 		VSB_printf(pan_vsp, "  step = %s,\n", stp);
 	else
@@ -253,14 +253,14 @@ pan_sess(const struct sess *sp)
 	if (hand != NULL)
 		VSB_printf(pan_vsp, "  handling = %s,\n", hand);
 	else
-		VSB_printf(pan_vsp, "  handling = 0x%x,\n", sp->handling);
+		VSB_printf(pan_vsp, "  handling = 0x%x,\n", sp->req->handling);
 	if (sp->err_code)
 		VSB_printf(pan_vsp,
 		    "  err_code = %d, err_reason = %s,\n", sp->err_code,
 		    sp->err_reason ? sp->err_reason : "(null)");
 
 	VSB_printf(pan_vsp, "  restarts = %d, esi_level = %d\n",
-	    sp->restarts, sp->esi_level);
+	    sp->req->restarts, sp->req->esi_level);
 
 	if (sp->wrk->busyobj != NULL)
 		pan_busyobj(sp->wrk->busyobj);
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index cbddb7d..e5dbf86 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -142,7 +142,7 @@ RES_BuildHttp(const struct sess *sp)
 	    sp->wrk->obj->exp.age + sp->t_resp - sp->wrk->obj->exp.entered);
 	http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
-	    sp->doclose ? "close" : "keep-alive");
+	    sp->req->doclose ? "close" : "keep-alive");
 }
 
 /*--------------------------------------------------------------------
@@ -261,7 +261,7 @@ RES_WriteObj(struct sess *sp)
 	if (sp->wrk->obj->response == 200 &&
 	    sp->http->conds &&
 	    RFC2616_Do_Cond(sp)) {
-		sp->wantbody = 0;
+		sp->req->wantbody = 0;
 		http_SetResp(sp->wrk->resp, "HTTP/1.1", 304, "Not Modified");
 		http_Unset(sp->wrk->resp, H_Content_Length);
 		http_Unset(sp->wrk->resp, H_Transfer_Encoding);
@@ -273,7 +273,7 @@ RES_WriteObj(struct sess *sp)
 	low = 0;
 	high = sp->wrk->obj->len - 1;
 	if (
-	    sp->wantbody &&
+	    sp->req->wantbody &&
 	    (sp->wrk->res_mode & RES_LEN) &&
 	    !(sp->wrk->res_mode & (RES_ESI|RES_ESI_CHILD|RES_GUNZIP)) &&
 	    cache_param->http_range_support &&
@@ -294,13 +294,13 @@ RES_WriteObj(struct sess *sp)
 		sp->wrk->acct_tmp.hdrbytes +=
 		    http_Write(sp->wrk, sp->vsl_id, sp->wrk->resp, 1);
 
-	if (!sp->wantbody)
+	if (!sp->req->wantbody)
 		sp->wrk->res_mode &= ~RES_CHUNKED;
 
 	if (sp->wrk->res_mode & RES_CHUNKED)
 		WRW_Chunked(sp->wrk);
 
-	if (!sp->wantbody) {
+	if (!sp->req->wantbody) {
 		/* This was a HEAD or conditional request */
 	} else if (sp->wrk->obj->len == 0) {
 		/* Nothing to do here */
@@ -336,7 +336,7 @@ RES_StreamStart(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sctx, STREAM_CTX_MAGIC);
 
 	AZ(sp->wrk->res_mode & RES_ESI_CHILD);
-	AN(sp->wantbody);
+	AN(sp->req->wantbody);
 
 	WRW_Reserve(sp->wrk, &sp->fd);
 	/*
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 530c96e..f1f502a 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -171,7 +171,6 @@ ses_setup(struct sessmem *sm)
 	sp->t_idle = NAN;
 	sp->t_req = NAN;
 	sp->t_resp = NAN;
-	EXP_Clr(&sp->exp);
 
 	WS_Init(sp->ws, "sess", sm->wsp, sm->workspace);
 	sp->http = sm->http[0];
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index f55607b..562f6df 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -176,7 +176,7 @@ vry_cmp(const uint8_t * const *v1, uint8_t * const *v2)
 int
 VRY_Match(struct sess *sp, const uint8_t *vary)
 {
-	uint8_t *vsp = sp->vary_b;
+	uint8_t *vsp = sp->req->vary_b;
 	char *h, *e;
 	unsigned lh, ln;
 	int i, retval = 1, oflo = 0;
@@ -202,8 +202,8 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
 
 			/* Length of the entire new vary entry */
 			ln = 2 + vary[2] + 2 + (lh == 0xffff ? 0 : lh);
-			if (vsp + ln >= sp->vary_e) {
-				vsp = sp->vary_b;
+			if (vsp + ln >= sp->req->vary_e) {
+				vsp = sp->req->vary_b;
 				oflo = 1;
 			}
 
@@ -211,7 +211,7 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
 			 * We MUST have space for one entry and the end marker
 			 * after it, which prevents old junk from confusing us
 			 */
-			assert(vsp + ln + 2 < sp->vary_e);
+			assert(vsp + ln + 2 < sp->req->vary_e);
 
 			vbe16enc(vsp, (uint16_t)lh);
 			memcpy(vsp + 2, vary + 2, vary[2] + 2);
@@ -229,20 +229,20 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
 		vsp += vry_len(vsp);
 		vary += vry_len(vary);
 	}
-	if (vsp + 3 > sp->vary_e)
+	if (vsp + 3 > sp->req->vary_e)
 		oflo = 1;
 
 	if (oflo) {
 		/* XXX: Should log this */
-		vsp = sp->vary_b;
+		vsp = sp->req->vary_b;
 	}
 	vsp[0] = 0xff;
 	vsp[1] = 0xff;
 	vsp[2] = 0;
 	if (oflo)
-		sp->vary_l = NULL;
+		sp->req->vary_l = NULL;
 	else
-		sp->vary_l = vsp + 3;
+		sp->req->vary_l = vsp + 3;
 	return (retval);
 }
 
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 068b482..06d4bd7 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -333,14 +333,14 @@ void									\
 VCL_##func##_method(struct sess *sp)					\
 {									\
 									\
-	sp->handling = 0;						\
-	sp->cur_method = VCL_MET_ ## upper;				\
+	sp->req->handling = 0;						\
+	sp->req->cur_method = VCL_MET_ ## upper;				\
 	WSP(sp, SLT_VCL_call, "%s", #func);				\
 	(void)sp->vcl->func##_func(sp);					\
-	WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->handling));	\
-	sp->cur_method = 0;						\
-	assert((1U << sp->handling) & bitmap);				\
-	assert(!((1U << sp->handling) & ~bitmap));			\
+	WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling));	\
+	sp->req->cur_method = 0;						\
+	assert((1U << sp->req->handling) & bitmap);				\
+	assert(!((1U << sp->req->handling) & ~bitmap));			\
 }
 
 #include "tbl/vcl_returns.h"
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index a696f64..9ec88cc 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -248,7 +248,7 @@ VRT_handling(struct sess *sp, unsigned hand)
 	}
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	assert(hand < VCL_RET_MAX);
-	sp->handling = hand;
+	sp->req->handling = hand;
 }
 
 /*--------------------------------------------------------------------
@@ -510,9 +510,9 @@ VRT_ban_string(struct sess *sp, const char *str)
 void
 VRT_purge(const struct sess *sp, double ttl, double grace)
 {
-	if (sp->cur_method == VCL_MET_HIT)
+	if (sp->req->cur_method == VCL_MET_HIT)
 		HSH_Purge(sp, sp->wrk->obj->objcore->objhead, ttl, grace);
-	else if (sp->cur_method == VCL_MET_MISS)
+	else if (sp->req->cur_method == VCL_MET_MISS)
 		HSH_Purge(sp, sp->wrk->objcore->objhead, ttl, grace);
 }
 
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 6f5544b..8c95d5b 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -327,15 +327,15 @@ VRT_l_req_esi(struct sess *sp, unsigned process_esi)
 	 * Only allow you to turn of esi in the main request
 	 * else everything gets confused
 	 */
-	if(sp->esi_level == 0)
-		sp->disable_esi = !process_esi;
+	if(sp->req->esi_level == 0)
+		sp->req->disable_esi = !process_esi;
 }
 
 unsigned __match_proto__()
 VRT_r_req_esi(struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	return (!sp->disable_esi);
+	return (!sp->req->disable_esi);
 }
 
 int
@@ -343,7 +343,7 @@ VRT_r_req_esi_level(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	return(sp->esi_level);
+	return(sp->req->esi_level);
 }
 
 /*--------------------------------------------------------------------*/
@@ -364,7 +364,7 @@ VRT_r_req_restarts(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	return (sp->restarts);
+	return (sp->req->restarts);
 }
 
 /*--------------------------------------------------------------------
@@ -401,9 +401,9 @@ vrt_wsp_exp(const struct sess *sp, unsigned xid, const struct exp *e)
 	    sp->t_req, e->age + (sp->t_req - e->entered));
 }
 
-VRT_DO_EXP(req, sp->exp, ttl, 0, )
-VRT_DO_EXP(req, sp->exp, grace, 0, )
-VRT_DO_EXP(req, sp->exp, keep, 0, )
+VRT_DO_EXP(req, sp->req->exp, ttl, 0, )
+VRT_DO_EXP(req, sp->req->exp, grace, 0, )
+VRT_DO_EXP(req, sp->req->exp, keep, 0, )
 
 VRT_DO_EXP(obj, sp->wrk->obj->exp, grace, 0,
    EXP_Rearm(sp->wrk->obj);
@@ -447,7 +447,7 @@ VRT_l_req_##hash_var(struct sess *sp, unsigned val)		\
 {								\
 								\
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);			\
-	sp->hash_var = val ? 1 : 0;				\
+	sp->req->hash_var = val ? 1 : 0;				\
 }								\
 								\
 unsigned __match_proto__()					\
@@ -455,7 +455,7 @@ VRT_r_req_##hash_var(struct sess *sp)				\
 {								\
 								\
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);			\
-	return(sp->hash_var);					\
+	return(sp->req->hash_var);					\
 }
 
 REQ_BOOL(hash_ignore_busy)



From phk at varnish-cache.org  Fri Dec 23 12:30:37 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 13:30:37 +0100
Subject: [master] 3abbb12 Move another 56 bytes from sess to req
Message-ID: <E1Re4Gj-0006qv-Jk@project.varnish-software.com>

commit 3abbb1270c6cdfd2511ddca4f316c98e7353efd7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 12:30:26 2011 +0000

    Move another 56 bytes from sess to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 1b2f1a7..578d548 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -605,6 +605,16 @@ struct req {
 	unsigned char		sendbody;
 	unsigned char		wantbody;
 
+	uint16_t		err_code;
+	const char		*err_reason;
+
+	struct director		*director;
+	struct VCL_conf		*vcl;
+
+	uint64_t		req_bodybytes;
+	char			*ws_req;	/* WS above request data */
+
+	double			t_resp;
 };
 
 /*--------------------------------------------------------------------*/
@@ -656,19 +666,9 @@ struct sess {
 	struct http		*http0;
 
 	struct ws		ws[1];
-	char			*ws_req;	/* WS above request data */
-
-	uint16_t		err_code;
-	const char		*err_reason;
-
-	struct director		*director;
-	struct VCL_conf		*vcl;
-
-	uint64_t		req_bodybytes;
 
 	/* Timestamps, all on TIM_real() timescale */
 	double			t_req;
-	double			t_resp;
 
 	/* TBD fields ------------------------------------------------*/
 
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 48c01a3..0b3c261 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -348,7 +348,7 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
 			/* XXX locking of stats */
 			VSC_C_main->backend_reuse += 1;
 			WSP(sp, SLT_Backend, "%d %s %s",
-			    vc->fd, sp->director->vcl_name, bp->display_name);
+			    vc->fd, sp->req->director->vcl_name, bp->display_name);
 			vc->vdis = vs;
 			vc->recycled = 1;
 			return (vc);
@@ -390,7 +390,7 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
 	vc->backend = bp;
 	VSC_C_main->backend_conn++;
 	WSP(sp, SLT_Backend, "%d %s %s",
-	    vc->fd, sp->director->vcl_name, bp->display_name);
+	    vc->fd, sp->req->director->vcl_name, bp->display_name);
 	vc->vdis = vs;
 	return (vc);
 }
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index cb5d161..6eef7cb 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -110,10 +110,11 @@ cnt_wait(struct sess *sp)
 	if (sp->req == NULL)
 		SES_GetReq(sp);
 
-	AZ(sp->vcl);
+	AZ(sp->req->vcl);
 	AZ(wrk->obj);
 	AZ(sp->req->esi_level);
 	assert(sp->req->xid == 0);
+	sp->req->t_resp = NAN;
 
 	assert(!isnan(sp->t_req));
 	tmo = (int)(1e3 * cache_param->timeout_linger);
@@ -210,7 +211,7 @@ cnt_prepresp(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 
 	if (wrk->busyobj != NULL) {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -268,13 +269,13 @@ cnt_prepresp(struct sess *sp)
 		}
 	}
 
-	sp->t_resp = W_TIM_real(wrk);
+	sp->req->t_resp = W_TIM_real(wrk);
 	if (wrk->obj->objcore != NULL) {
-		if ((sp->t_resp - wrk->obj->last_lru) >
+		if ((sp->req->t_resp - wrk->obj->last_lru) >
 		    cache_param->lru_timeout &&
 		    EXP_Touch(wrk->obj->objcore))
-			wrk->obj->last_lru = sp->t_resp;
-		wrk->obj->last_use = sp->t_resp;	/* XXX: locking ? */
+			wrk->obj->last_lru = sp->req->t_resp;
+		wrk->obj->last_use = sp->req->t_resp;	/* XXX: locking ? */
 	}
 	http_Setup(wrk->resp, wrk->ws);
 	RES_BuildHttp(sp);
@@ -295,7 +296,7 @@ cnt_prepresp(struct sess *sp)
 		}
 		AZ(wrk->obj);
 		sp->req->restarts++;
-		sp->director = NULL;
+		sp->req->director = NULL;
 		http_Setup(wrk->resp, NULL);
 		sp->step = STP_RECV;
 		return (0);
@@ -336,7 +337,7 @@ cnt_deliver(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	AZ(sp->wrk->busyobj);
-	sp->director = NULL;
+	sp->req->director = NULL;
 	sp->req->restarts = 0;
 
 	RES_WriteObj(sp);
@@ -373,11 +374,11 @@ cnt_done(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_ORNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_ORNULL(sp->req->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
-	sp->director = NULL;
+	sp->req->director = NULL;
 	sp->req->restarts = 0;
 
 	wrk->busyobj = NULL;
@@ -388,26 +389,26 @@ cnt_done(struct sess *sp)
 	if (sp->req->esi_level > 0)
 		return (1);
 
-	if (sp->vcl != NULL) {
+	if (sp->req->vcl != NULL) {
 		if (wrk->vcl != NULL)
 			VCL_Rel(&wrk->vcl);
-		wrk->vcl = sp->vcl;
-		sp->vcl = NULL;
+		wrk->vcl = sp->req->vcl;
+		sp->req->vcl = NULL;
 	}
 
 
 	sp->t_idle = W_TIM_real(wrk);
 	if (sp->req->xid == 0) {
-		sp->t_resp = sp->t_idle;
+		sp->req->t_resp = sp->t_idle;
 	} else {
-		dp = sp->t_resp - sp->t_req;
-		da = sp->t_idle - sp->t_resp;
+		dp = sp->req->t_resp - sp->t_req;
+		da = sp->t_idle - sp->req->t_resp;
 		dh = sp->t_req - sp->t_open;
 		/* XXX: Add StatReq == StatSess */
 		/* XXX: Workaround for pipe */
 		if (sp->fd >= 0) {
 			WSP(sp, SLT_Length, "%ju",
-			    (uintmax_t)sp->req_bodybytes);
+			    (uintmax_t)sp->req->req_bodybytes);
 		}
 		WSP(sp, SLT_ReqEnd, "%u %.9f %.9f %.9f %.9f %.9f",
 		    sp->req->xid, sp->t_req, sp->t_idle, dh, dp, da);
@@ -416,9 +417,9 @@ cnt_done(struct sess *sp)
 	WSL_Flush(wrk, 0);
 
 	sp->t_req = NAN;
-	sp->t_resp = NAN;
+	sp->req->t_resp = NAN;
 
-	sp->req_bodybytes = 0;
+	sp->req->req_bodybytes = 0;
 
 	sp->req->hash_always_miss = 0;
 	sp->req->hash_ignore_busy = 0;
@@ -496,7 +497,7 @@ cnt_error(struct sess *sp)
 			    (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL) {
 			sp->req->doclose = "Out of objects";
-			sp->director = NULL;
+			sp->req->director = NULL;
 			http_Setup(wrk->busyobj->beresp, NULL);
 			http_Setup(wrk->busyobj->bereq, NULL);
 			sp->step = STP_DONE;
@@ -512,27 +513,27 @@ cnt_error(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
 	h = wrk->obj->http;
 
-	if (sp->err_code < 100 || sp->err_code > 999)
-		sp->err_code = 501;
+	if (sp->req->err_code < 100 || sp->req->err_code > 999)
+		sp->req->err_code = 501;
 
 	http_PutProtocol(wrk, sp->vsl_id, h, "HTTP/1.1");
-	http_PutStatus(h, sp->err_code);
+	http_PutStatus(h, sp->req->err_code);
 	VTIM_format(W_TIM_real(wrk), date);
 	http_PrintfHeader(wrk, sp->vsl_id, h, "Date: %s", date);
 	http_SetHeader(wrk, sp->vsl_id, h, "Server: Varnish");
 
-	if (sp->err_reason != NULL)
-		http_PutResponse(wrk, sp->vsl_id, h, sp->err_reason);
+	if (sp->req->err_reason != NULL)
+		http_PutResponse(wrk, sp->vsl_id, h, sp->req->err_reason);
 	else
 		http_PutResponse(wrk, sp->vsl_id, h,
-		    http_StatusMessage(sp->err_code));
+		    http_StatusMessage(sp->req->err_code));
 	VCL_error_method(sp);
 
 	if (sp->req->handling == VCL_RET_RESTART &&
 	    sp->req->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
-		sp->director = NULL;
+		sp->req->director = NULL;
 		sp->req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
@@ -545,8 +546,8 @@ cnt_error(struct sess *sp)
 	sp->req->wantbody = 1;
 
 	assert(sp->req->handling == VCL_RET_DELIVER);
-	sp->err_code = 0;
-	sp->err_reason = NULL;
+	sp->req->err_code = 0;
+	sp->req->err_reason = NULL;
 	http_Setup(wrk->busyobj->bereq, NULL);
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_PREPRESP;
@@ -592,10 +593,10 @@ cnt_fetch(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
-	AN(sp->director);
+	AN(sp->req->director);
 	AZ(wrk->busyobj->vbc);
 	AZ(wrk->busyobj->should_close);
 	AZ(wrk->storage_hint);
@@ -617,7 +618,7 @@ cnt_fetch(struct sess *sp)
 
 	if (i) {
 		sp->req->handling = VCL_RET_ERROR;
-		sp->err_code = 503;
+		sp->req->err_code = 503;
 	} else {
 		/*
 		 * These two headers can be spread over multiple actual headers
@@ -634,7 +635,7 @@ cnt_fetch(struct sess *sp)
 		 */
 		wrk->busyobj->body_status = RFC2616_Body(sp);
 
-		sp->err_code = http_GetStatus(wrk->busyobj->beresp);
+		sp->req->err_code = http_GetStatus(wrk->busyobj->beresp);
 
 		/*
 		 * What does RFC2616 think about TTL ?
@@ -678,7 +679,7 @@ cnt_fetch(struct sess *sp)
 		wrk->objcore = NULL;
 	}
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
-	sp->director = NULL;
+	sp->req->director = NULL;
 	wrk->storage_hint = NULL;
 
 	switch (sp->req->handling) {
@@ -847,7 +848,7 @@ cnt_fetchbody(struct sess *sp)
 		wrk->busyobj->exp.keep = 0.0;
 	}
 	if (wrk->obj == NULL) {
-		sp->err_code = 503;
+		sp->req->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
@@ -870,7 +871,7 @@ cnt_fetchbody(struct sess *sp)
 	}
 
 	wrk->obj->xid = sp->req->xid;
-	wrk->obj->response = sp->err_code;
+	wrk->obj->response = sp->req->err_code;
 	WS_Assert(wrk->obj->ws_o);
 
 	/* Filter into object */
@@ -915,13 +916,13 @@ cnt_fetchbody(struct sess *sp)
 	wrk->busyobj->vfp = NULL;
 	assert(WRW_IsReleased(wrk));
 	AZ(wrk->busyobj->vbc);
-	AN(sp->director);
+	AN(sp->req->director);
 
 	if (i) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		AZ(wrk->obj);
-		sp->err_code = 503;
+		sp->req->err_code = 503;
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -984,7 +985,7 @@ cnt_streambody(struct sess *sp)
 	http_Setup(wrk->busyobj->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
 	AZ(wrk->busyobj->vbc);
-	AN(sp->director);
+	AN(sp->req->director);
 
 	if (!i && wrk->obj->objcore != NULL) {
 		EXP_Insert(wrk->obj);
@@ -995,7 +996,7 @@ cnt_streambody(struct sess *sp)
 		sp->req->doclose = "Stream error";
 	}
 	wrk->acct_tmp.fetch++;
-	sp->director = NULL;
+	sp->req->director = NULL;
 	sp->req->restarts = 0;
 
 	RES_StreamEnd(sp);
@@ -1089,7 +1090,7 @@ cnt_hit(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
 	assert(!(wrk->obj->objcore->flags & OC_F_PASS));
@@ -1117,7 +1118,7 @@ cnt_hit(struct sess *sp)
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_RESTART:
-		sp->director = NULL;
+		sp->req->director = NULL;
 		sp->req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
@@ -1166,7 +1167,7 @@ cnt_lookup(struct sess *sp)
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
 	if (sp->req->hash_objhead == NULL) {
@@ -1275,7 +1276,7 @@ cnt_miss(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
 	AN(wrk->objcore);
@@ -1369,7 +1370,7 @@ cnt_pass(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 
@@ -1429,7 +1430,7 @@ cnt_pipe(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
 	wrk->acct_tmp.pipe++;
@@ -1482,15 +1483,15 @@ cnt_recv(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 
 	/* By default we use the first backend */
-	AZ(sp->director);
-	sp->director = sp->vcl->director[0];
-	AN(sp->director);
+	AZ(sp->req->director);
+	sp->req->director = sp->req->vcl->director[0];
+	AN(sp->req->director);
 
 	sp->req->disable_esi = 0;
 	sp->req->hash_always_miss = 0;
@@ -1503,8 +1504,8 @@ cnt_recv(struct sess *sp)
 	recv_handling = sp->req->handling;
 
 	if (sp->req->restarts >= cache_param->max_restarts) {
-		if (sp->err_code == 0)
-			sp->err_code = 503;
+		if (sp->req->err_code == 0)
+			sp->req->err_code = 503;
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -1584,7 +1585,7 @@ cnt_start(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 	AZ(sp->req->restarts);
 	AZ(wrk->obj);
-	AZ(sp->vcl);
+	AZ(sp->req->vcl);
 	EXP_Clr(&sp->req->exp);
 	AZ(sp->req->esi_level);
 
@@ -1599,7 +1600,7 @@ cnt_start(struct sess *sp)
 
 	/* Borrow VCL reference from worker thread */
 	VCL_Refresh(&wrk->vcl);
-	sp->vcl = wrk->vcl;
+	sp->req->vcl = wrk->vcl;
 	wrk->vcl = NULL;
 
 	http_Setup(sp->http, sp->ws);
@@ -1613,13 +1614,13 @@ cnt_start(struct sess *sp)
 	}
 
 	/* Catch request snapshot */
-	sp->ws_req = WS_Snapshot(sp->ws);
+	sp->req->ws_req = WS_Snapshot(sp->ws);
 
 	/* Catch original request, before modification */
 	HTTP_Copy(sp->http0, sp->http);
 
 	if (done != 0) {
-		sp->err_code = done;
+		sp->req->err_code = done;
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -1633,7 +1634,7 @@ cnt_start(struct sess *sp)
 	 */
 	if (http_GetHdr(sp->http, H_Expect, &p)) {
 		if (strcasecmp(p, "100-continue")) {
-			sp->err_code = 417;
+			sp->req->err_code = 417;
 			sp->step = STP_ERROR;
 			return (0);
 		}
@@ -1661,14 +1662,21 @@ cnt_start(struct sess *sp)
 static void
 cnt_diag(struct sess *sp, const char *state)
 {
+	void *vcl;
+
+	if (sp->req == NULL)
+		vcl = NULL;
+	else
+		vcl = sp->req->vcl;
+
 	if (sp->wrk != NULL) {
 		WSP(sp, SLT_Debug, "thr %p STP_%s sp %p obj %p vcl %p",
-		    pthread_self(), state, sp, sp->wrk->obj, sp->vcl);
+		    pthread_self(), state, sp, sp->wrk->obj, vcl);
 		WSL_Flush(sp->wrk, 0);
 	} else {
 		VSL(SLT_Debug, sp->vsl_id,
 		    "thr %p STP_%s sp %p obj %p vcl %p",
-		    pthread_self(), state, sp, sp->wrk->obj, sp->vcl);
+		    pthread_self(), state, sp, sp->wrk->obj, vcl);
 	}
 }
 
diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index 5902ce8..4ec81fb 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -105,7 +105,7 @@ VDI_GetFd(const struct director *d, struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (d == NULL)
-		d = sp->director;
+		d = sp->req->director;
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	return (d->getfd(d, sp));
 }
diff --git a/bin/varnishd/cache/cache_dir_dns.c b/bin/varnishd/cache/cache_dir_dns.c
index 56bce48..517caaa 100644
--- a/bin/varnishd/cache/cache_dir_dns.c
+++ b/bin/varnishd/cache/cache_dir_dns.c
@@ -403,8 +403,8 @@ vdi_dns_healthy(const struct director *dir, const struct sess *sp)
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->director, DIRECTOR_MAGIC);
-	CAST_OBJ_NOTNULL(vs, sp->director->priv, VDI_DNS_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->director, DIRECTOR_MAGIC);
+	CAST_OBJ_NOTNULL(vs, sp->req->director->priv, VDI_DNS_MAGIC);
 
 	dir = vdi_dns_find_backend(sp, vs);
 
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 36ff704..e1d3945 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -80,7 +80,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	 * XXX: or not (for session/backend coupling).  Until then
 	 * XXX: make sure we don't trip up the check in vcl_recv.
 	 */
-	sp->director = NULL;
+	sp->req->director = NULL;
 	sp->step = STP_RECV;
 	http_ForceGet(sp->http);
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 79d0665..9f1d822 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -390,7 +390,7 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	htc = &wrk->busyobj->htc;
 
-	AN(sp->director);
+	AN(sp->req->director);
 	AZ(sp->wrk->obj);
 
 	if (sp->wrk->objcore != NULL) {		/* pass has no objcore */
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 627db48..dbcca41 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -302,7 +302,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
-	AN(sp->director);
+	AN(sp->req->director);
 	AN(hash);
 	wrk = sp->wrk;
 
@@ -393,7 +393,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	if (oc == NULL			/* We found no live object */
 	    && grace_oc != NULL		/* There is a grace candidate */
 	    && (busy_oc != NULL		/* Somebody else is already busy */
-	    || !VDI_Healthy(sp->director, sp))) {
+	    || !VDI_Healthy(sp->req->director, sp))) {
 					/* Or it is impossible to fetch */
 		o = oc_getobj(sp->wrk, grace_oc);
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 44c8fc3..9710517 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -254,10 +254,10 @@ pan_sess(const struct sess *sp)
 		VSB_printf(pan_vsp, "  handling = %s,\n", hand);
 	else
 		VSB_printf(pan_vsp, "  handling = 0x%x,\n", sp->req->handling);
-	if (sp->err_code)
+	if (sp->req->err_code)
 		VSB_printf(pan_vsp,
-		    "  err_code = %d, err_reason = %s,\n", sp->err_code,
-		    sp->err_reason ? sp->err_reason : "(null)");
+		    "  err_code = %d, err_reason = %s,\n", sp->req->err_code,
+		    sp->req->err_reason ? sp->req->err_reason : "(null)");
 
 	VSB_printf(pan_vsp, "  restarts = %d, esi_level = %d\n",
 	    sp->req->restarts, sp->req->esi_level);
@@ -271,8 +271,8 @@ pan_sess(const struct sess *sp)
 	if (sp->wrk != NULL)
 		pan_wrk(sp->wrk);
 
-	if (VALID_OBJ(sp->vcl, VCL_CONF_MAGIC))
-		pan_vcl(sp->vcl);
+	if (VALID_OBJ(sp->req->vcl, VCL_CONF_MAGIC))
+		pan_vcl(sp->req->vcl);
 
 	if (VALID_OBJ(sp->wrk->obj, OBJECT_MAGIC))
 		pan_object(sp->wrk->obj);
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index cc98fba..8bf76f3 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -94,7 +94,7 @@ PipeSession(struct sess *sp)
 		return;
 	}
 
-	sp->t_resp = VTIM_real();
+	sp->req->t_resp = VTIM_real();
 
 	memset(fds, 0, sizeof fds);
 
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index e5dbf86..fe5f29f 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -139,7 +139,7 @@ RES_BuildHttp(const struct sess *sp)
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
 		    "X-Varnish: %u", sp->req->xid);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
-	    sp->wrk->obj->exp.age + sp->t_resp - sp->wrk->obj->exp.entered);
+	    sp->wrk->obj->exp.age + sp->req->t_resp - sp->wrk->obj->exp.entered);
 	http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
 	    sp->req->doclose ? "close" : "keep-alive");
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 2878d9a..5c5e5e2 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -98,7 +98,7 @@ RFC2616_Ttl(const struct sess *sp)
 	if (http_GetHdr(hp, H_Date, &p))
 		h_date = VTIM_parse(p);
 
-	switch (sp->err_code) {
+	switch (sp->req->err_code) {
 	default:
 		expp->ttl = -1.;
 		break;
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index f1f502a..42ce7df 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -82,7 +82,7 @@ SES_Charge(struct sess *sp)
 {
 	struct acct *a = &sp->wrk->acct_tmp;
 
-	sp->req_bodybytes += a->bodybytes;
+	sp->req->req_bodybytes += a->bodybytes;
 
 #define ACCT(foo)				\
 	sp->wrk->stats.s_##foo += a->foo;	\
@@ -170,7 +170,6 @@ ses_setup(struct sessmem *sm)
 	sp->t_open = NAN;
 	sp->t_idle = NAN;
 	sp->t_req = NAN;
-	sp->t_resp = NAN;
 
 	WS_Init(sp->ws, "sess", sm->wsp, sm->workspace);
 	sp->http = sm->http[0];
@@ -274,12 +273,12 @@ SES_Schedule(struct sess *sp)
 	if (Pool_Schedule(pp->pool, sp)) {
 		VSC_C_main->client_drop_late++;
 		sp->t_idle = VTIM_real();
-		if (sp->vcl != NULL) {
+		if (sp->req->vcl != NULL) {
 			/*
 			 * A session parked on a busy object can come here
 			 * after it wakes up.  Loose the VCL reference.
 			 */
-			VCL_Rel(&sp->vcl);
+			VCL_Rel(&sp->req->vcl);
 		}
 		SES_Delete(sp, "dropped", sp->t_idle);
 		return (1);
@@ -349,10 +348,11 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 	assert(!isnan(sp->t_open));
 	assert(sp->fd < 0);
 
-	if (sp->req != NULL)
+	if (sp->req != NULL) {
+		AZ(sp->req->vcl);
 		SES_ReleaseReq(sp);
+	}
 
-	AZ(sp->vcl);
 	if (*sp->addr == '\0')
 		strcpy(sp->addr, "-");
 	if (*sp->port == '\0')
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 06d4bd7..4cf61c4 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -336,7 +336,7 @@ VCL_##func##_method(struct sess *sp)					\
 	sp->req->handling = 0;						\
 	sp->req->cur_method = VCL_MET_ ## upper;				\
 	WSP(sp, SLT_VCL_call, "%s", #func);				\
-	(void)sp->vcl->func##_func(sp);					\
+	(void)sp->req->vcl->func##_func(sp);					\
 	WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling));	\
 	sp->req->cur_method = 0;						\
 	assert((1U << sp->req->handling) & bitmap);				\
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 9ec88cc..e078f8f 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -60,8 +60,8 @@ VRT_error(struct sess *sp, unsigned code, const char *reason)
 	    reason : "(null)");
 	if (code < 100 || code > 999)
 		code = 503;
-	sp->err_code = (uint16_t)code;
-	sp->err_reason = reason ? reason : http_StatusMessage(sp->err_code);
+	sp->req->err_code = (uint16_t)code;
+	sp->req->err_reason = reason ? reason : http_StatusMessage(sp->req->err_code);
 }
 
 /*--------------------------------------------------------------------*/
@@ -75,7 +75,7 @@ VRT_count(const struct sess *sp, unsigned u)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (cache_param->vcl_trace)
 		WSP(sp, SLT_VCL_trace, "%u %u.%u", u,
-		    sp->vcl->ref[u].line, sp->vcl->ref[u].pos);
+		    sp->req->vcl->ref[u].line, sp->req->vcl->ref[u].pos);
 }
 
 /*--------------------------------------------------------------------*/
@@ -351,7 +351,7 @@ VRT_backend_string(const struct sess *sp, const struct director *d)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (d == NULL)
-		d = sp->director;
+		d = sp->req->director;
 	if (d == NULL)
 		return (NULL);
 	return (d->vcl_name);
@@ -372,7 +372,7 @@ VRT_Rollback(struct sess *sp)
 {
 
 	HTTP_Copy(sp->http, sp->http0);
-	WS_Reset(sp->ws, sp->ws_req);
+	WS_Reset(sp->ws, sp->req->ws_req);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 8c95d5b..aef935b 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -307,14 +307,14 @@ void
 VRT_l_req_backend(struct sess *sp, struct director *be)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	sp->director = be;
+	sp->req->director = be;
 }
 
 struct director * __match_proto__()
 VRT_r_req_backend(struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	return (sp->director);
+	return (sp->req->director);
 }
 
 /*--------------------------------------------------------------------*/
@@ -548,7 +548,7 @@ unsigned
 VRT_r_req_backend_healthy(const struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->director, DIRECTOR_MAGIC);
-	return (VDI_Healthy(sp->director, sp));
+	CHECK_OBJ_NOTNULL(sp->req->director, DIRECTOR_MAGIC);
+	return (VDI_Healthy(sp->req->director, sp));
 }
 
diff --git a/bin/varnishd/cache/cache_wrw.c b/bin/varnishd/cache/cache_wrw.c
index 96fa3e5..c344f9c 100644
--- a/bin/varnishd/cache/cache_wrw.c
+++ b/bin/varnishd/cache/cache_wrw.c
@@ -159,7 +159,7 @@ WRW_Flush(struct worker *wrk)
 			 * counter to prevent slowlaris attacks
 			*/
 
-			if (VTIM_real() - wrk->sp->t_resp >
+			if (VTIM_real() - wrk->sp->req->t_resp >
 			    cache_param->send_timeout) {
 				WSL(wrk, SLT_Debug, *wrw->wfd,
 				    "Hit total send timeout, "
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 44e9721..b0f461a 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -69,7 +69,6 @@ WAIT_Enter(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
 	AZ(sp->req);
-	AZ(sp->vcl);
 	assert(sp->fd >= 0);
 	sp->wrk = NULL;
 



From phk at varnish-cache.org  Fri Dec 23 12:47:45 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 13:47:45 +0100
Subject: [master] f918ddb Move the HTC from sess to req,
	that's another 64 bytes.
Message-ID: <E1Re4XJ-0007wH-BX@project.varnish-software.com>

commit f918ddbfaaf2b8c449f6595331fcdc6664bada2f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 12:47:32 2011 +0000

    Move the HTC from sess to req, that's another 64 bytes.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 578d548..bf4754b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -615,6 +615,9 @@ struct req {
 	char			*ws_req;	/* WS above request data */
 
 	double			t_resp;
+
+	struct http_conn	htc[1];
+
 };
 
 /*--------------------------------------------------------------------*/
@@ -670,10 +673,6 @@ struct sess {
 	/* Timestamps, all on TIM_real() timescale */
 	double			t_req;
 
-	/* TBD fields ------------------------------------------------*/
-
-	struct http_conn	htc[1];
-
 };
 
 /* Prototypes etc ----------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 6eef7cb..b6d7a67 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -107,8 +107,12 @@ cnt_wait(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	if (sp->req == NULL)
+	if (sp->req == NULL) {
 		SES_GetReq(sp);
+		HTC_Init(sp->req->htc, sp->ws, sp->fd, sp->vsl_id,
+		    cache_param->http_req_size,
+		    cache_param->http_req_hdr_len);
+	}
 
 	AZ(sp->req->vcl);
 	AZ(wrk->obj);
@@ -126,9 +130,9 @@ cnt_wait(struct sess *sp)
 		assert(j >= 0);
 		now = VTIM_real();
 		if (j != 0)
-			i = HTC_Rx(sp->htc);
+			i = HTC_Rx(sp->req->htc);
 		else
-			i = HTC_Complete(sp->htc);
+			i = HTC_Complete(sp->req->htc);
 		if (i == 1) {
 			/* Got it, run with it */
 			sp->t_req = now;
@@ -156,6 +160,8 @@ cnt_wait(struct sess *sp)
 				wrk->stats.sess_herd++;
 				SES_Charge(sp);
 				SES_ReleaseReq(sp);
+				WS_Release(sp->ws, 0);
+				WS_Reset(sp->ws, NULL);
 				WAIT_Enter(sp);
 				return (1);
 			}
@@ -445,14 +451,14 @@ cnt_done(struct sess *sp)
 	WS_Reset(sp->ws, NULL);
 	WS_Reset(wrk->ws, NULL);
 
-	i = HTC_Reinit(sp->htc);
+	i = HTC_Reinit(sp->req->htc);
 	if (i == 1) {
 		wrk->stats.sess_pipeline++;
 		sp->t_req = sp->t_idle;
 		sp->step = STP_START;
 		return (0);
 	}
-	if (Tlen(sp->htc->rxbuf))
+	if (Tlen(sp->req->htc->rxbuf))
 		wrk->stats.sess_readahead++;
 	sp->step = STP_WAIT;
 	sp->t_req = sp->t_idle;
@@ -1052,10 +1058,6 @@ cnt_first(struct sess *sp)
 		    sp->addr, sp->port, sp->mylsock->name);
 	}
 
-	/* Receive a HTTP protocol request */
-	HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id,
-	    cache_param->http_req_size,
-	    cache_param->http_req_hdr_len);
 	wrk->acct_tmp.sess++;
 
 	sp->step = STP_WAIT;
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 9f1d822..dbf30e6 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -345,7 +345,7 @@ FetchReqBody(struct sess *sp)
 				rdcnt = sizeof buf;
 			else
 				rdcnt = content_length;
-			rdcnt = HTC_Read(sp->wrk, sp->htc, buf, rdcnt);
+			rdcnt = HTC_Read(sp->wrk, sp->req->htc, buf, rdcnt);
 			if (rdcnt <= 0)
 				return (1);
 			content_length -= rdcnt;
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 803fed2..93bd896 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -658,7 +658,7 @@ http_DissectRequest(struct sess *sp)
 	uint16_t retval;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	htc = sp->htc;
+	htc = sp->req->htc;
 	CHECK_OBJ_NOTNULL(htc, HTTP_CONN_MAGIC);
 	hp = sp->http;
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 8bf76f3..a8282d7 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -82,9 +82,9 @@ PipeSession(struct sess *sp)
 	sp->wrk->acct_tmp.hdrbytes +=
 	    http_Write(w, sp->vsl_id, sp->wrk->busyobj->bereq, 0);
 
-	if (sp->htc->pipeline.b != NULL)
+	if (sp->req->htc->pipeline.b != NULL)
 		sp->wrk->acct_tmp.bodybytes +=
-		    WRW_Write(w, sp->htc->pipeline.b, Tlen(sp->htc->pipeline));
+		    WRW_Write(w, sp->req->htc->pipeline.b, Tlen(sp->req->htc->pipeline));
 
 	i = WRW_FlushRelease(w);
 



From phk at varnish-cache.org  Fri Dec 23 12:55:52 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Fri, 23 Dec 2011 13:55:52 +0100
Subject: [master] a1d9126 Move another 8 bytes from sess to req
Message-ID: <E1Re4fA-0000CS-E3@project.varnish-software.com>

commit a1d91261e761afa4f534911cb98a93d1473d78b2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Dec 23 12:55:42 2011 +0000

    Move another 8 bytes from sess to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index bf4754b..7517d1c 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -617,6 +617,7 @@ struct req {
 	double			t_resp;
 
 	struct http_conn	htc[1];
+	char			*client_identity;
 
 };
 
@@ -646,7 +647,6 @@ struct sess {
 	/* formatted ascii client address */
 	char			addr[ADDR_BUFSIZE];
 	char			port[PORT_BUFSIZE];
-	char			*client_identity;
 
 	VTAILQ_ENTRY(sess)	poollist;
 	struct acct		acct_ses;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index b6d7a67..5816119 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1498,7 +1498,7 @@ cnt_recv(struct sess *sp)
 	sp->req->disable_esi = 0;
 	sp->req->hash_always_miss = 0;
 	sp->req->hash_ignore_busy = 0;
-	sp->client_identity = NULL;
+	sp->req->client_identity = NULL;
 
 	http_CollectHdr(sp->http, H_Cache_Control);
 
diff --git a/bin/varnishd/cache/cache_dir_random.c b/bin/varnishd/cache/cache_dir_random.c
index 28a079c..b323343 100644
--- a/bin/varnishd/cache/cache_dir_random.c
+++ b/bin/varnishd/cache/cache_dir_random.c
@@ -105,8 +105,8 @@ vdi_random_init_seed(const struct vdi_random *vs, const struct sess *sp)
 
 	switch (vs->criteria) {
 	case c_client:
-		if (sp->client_identity != NULL)
-			p = sp->client_identity;
+		if (sp->req->client_identity != NULL)
+			p = sp->req->client_identity;
 		else
 			p = sp->addr;
 		retval = vdi_random_sha(p, strlen(p));
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index aef935b..7ac9768 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -209,8 +209,8 @@ const char * __match_proto__()
 VRT_r_client_identity(struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	if (sp->client_identity != NULL)
-		return (sp->client_identity);
+	if (sp->req->client_identity != NULL)
+		return (sp->req->client_identity);
 	else
 		return (sp->addr);
 }
@@ -224,7 +224,7 @@ VRT_l_client_identity(struct sess *sp, const char *str, ...)
 	va_start(ap, str);
 	b = VRT_String(sp->http->ws, NULL, str, ap);
 	va_end(ap);
-	sp->client_identity = b;
+	sp->req->client_identity = b;
 }
 
 /*--------------------------------------------------------------------*/



From phk at varnish-cache.org  Sun Dec 25 10:09:37 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 11:09:37 +0100
Subject: [master] 45202f7 This is an interim snapshot committed mostly for
	debugging purposes, do not run in production!
Message-ID: <E1Rel1N-0006RK-7E@project.varnish-software.com>

commit 45202f7f39093f95a21e7efbb90c95c1eda96d33
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 10:07:31 2011 +0000

    This is an interim snapshot committed mostly for debugging purposes,
    do not run in production!
    
    Allocate the workspace as part of struct req, and move sp->ws,
    sp->http and sp->http0 to struct req.
    
    Allocate the req->http[0] on the workspace, so that changes to
    nhttp does not force us to dump the mempool.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 7517d1c..d1dc4fb 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -619,6 +619,11 @@ struct req {
 	struct http_conn	htc[1];
 	char			*client_identity;
 
+	/* HTTP request */
+	struct http		*http;
+	struct http		*http0;
+
+	struct ws		ws[1];
 };
 
 /*--------------------------------------------------------------------*/
@@ -664,11 +669,6 @@ struct sess {
 
 	/* Request related fields ------------------------------------*/
 
-	/* HTTP request */
-	struct http		*http;
-	struct http		*http0;
-
-	struct ws		ws[1];
 
 	/* Timestamps, all on TIM_real() timescale */
 	double			t_req;
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 2badb76..9162f50 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -675,6 +675,7 @@ ban_check_object(struct object *o, const struct sess *sp, int has_req)
 	struct objcore *oc;
 	struct ban * volatile b0;
 	unsigned tests, skipped;
+	struct http *http;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
@@ -688,6 +689,11 @@ ban_check_object(struct object *o, const struct sess *sp, int has_req)
 	if (b0 == oc->ban)
 		return (0);
 
+	if (has_req)
+		http = sp->req->http;
+	else
+		http = NULL;
+
 	/*
 	 * This loop is safe without locks, because we know we hold
 	 * a refcount on a ban somewhere in the list and we do not
@@ -711,7 +717,7 @@ ban_check_object(struct object *o, const struct sess *sp, int has_req)
 			 * be other bans that match, so we soldier on
 			 */
 			skipped++;
-		} else if (ban_evaluate(b->spec, o->http, sp->http, &tests))
+		} else if (ban_evaluate(b->spec, o->http, http, &tests))
 			break;
 	}
 
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 5816119..6bf3f6a 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -109,7 +109,7 @@ cnt_wait(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	if (sp->req == NULL) {
 		SES_GetReq(sp);
-		HTC_Init(sp->req->htc, sp->ws, sp->fd, sp->vsl_id,
+		HTC_Init(sp->req->htc, sp->req->ws, sp->fd, sp->vsl_id,
 		    cache_param->http_req_size,
 		    cache_param->http_req_hdr_len);
 	}
@@ -160,8 +160,6 @@ cnt_wait(struct sess *sp)
 				wrk->stats.sess_herd++;
 				SES_Charge(sp);
 				SES_ReleaseReq(sp);
-				WS_Release(sp->ws, 0);
-				WS_Reset(sp->ws, NULL);
 				WAIT_Enter(sp);
 				return (1);
 			}
@@ -267,7 +265,7 @@ cnt_prepresp(struct sess *sp)
 			wrk->res_mode |= RES_LEN;
 		else if (!sp->req->wantbody) {
 			/* Nothing */
-		} else if (sp->http->protover >= 11) {
+		} else if (sp->req->http->protover >= 11) {
 			wrk->res_mode |= RES_CHUNKED;
 		} else {
 			wrk->res_mode |= RES_EOF;
@@ -448,7 +446,7 @@ cnt_done(struct sess *sp)
 	if (wrk->stats.client_req >= cache_param->wthread_stats_rate)
 		WRK_SumStat(wrk);
 	/* Reset the workspace to the session-watermark */
-	WS_Reset(sp->ws, NULL);
+	WS_Reset(sp->req->ws, NULL);
 	WS_Reset(wrk->ws, NULL);
 
 	i = HTC_Reinit(sp->req->htc);
@@ -903,7 +901,7 @@ cnt_fetchbody(struct sess *sp)
 	 * that allow the 304, in which case we return 200 non-stream.
 	 */
 	if (wrk->obj->response == 200 &&
-	    sp->http->conds &&
+	    sp->req->http->conds &&
 	    RFC2616_Do_Cond(sp))
 		wrk->busyobj->do_stream = 0;
 
@@ -1177,12 +1175,12 @@ cnt_lookup(struct sess *sp)
 		AZ(sp->req->vary_b);
 		AZ(sp->req->vary_l);
 		AZ(sp->req->vary_e);
-		(void)WS_Reserve(sp->ws, 0);
+		(void)WS_Reserve(sp->req->ws, 0);
 	} else {
-		AN(sp->ws->r);
+		AN(sp->req->ws->r);
 	}
-	sp->req->vary_b = (void*)sp->ws->f;
-	sp->req->vary_e = (void*)sp->ws->r;
+	sp->req->vary_b = (void*)sp->req->ws->f;
+	sp->req->vary_e = (void*)sp->req->ws->r;
 	sp->req->vary_b[2] = '\0';
 
 	oc = HSH_Lookup(sp, &oh);
@@ -1208,10 +1206,10 @@ cnt_lookup(struct sess *sp)
 		if (sp->req->vary_l != NULL) {
 			assert(oc->busyobj->vary == sp->req->vary_b);
 			VRY_Validate(oc->busyobj->vary);
-			WS_ReleaseP(sp->ws, (void*)sp->req->vary_l);
+			WS_ReleaseP(sp->req->ws, (void*)sp->req->vary_l);
 		} else {
 			AZ(oc->busyobj->vary);
-			WS_Release(sp->ws, 0);
+			WS_Release(sp->req->ws, 0);
 		}
 		sp->req->vary_b = NULL;
 		sp->req->vary_l = NULL;
@@ -1227,7 +1225,7 @@ cnt_lookup(struct sess *sp)
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	wrk->obj = o;
 
-	WS_Release(sp->ws, 0);
+	WS_Release(sp->req->ws, 0);
 	sp->req->vary_b = NULL;
 	sp->req->vary_l = NULL;
 	sp->req->vary_e = NULL;
@@ -1500,7 +1498,7 @@ cnt_recv(struct sess *sp)
 	sp->req->hash_ignore_busy = 0;
 	sp->req->client_identity = NULL;
 
-	http_CollectHdr(sp->http, H_Cache_Control);
+	http_CollectHdr(sp->req->http, H_Cache_Control);
 
 	VCL_recv_method(sp);
 	recv_handling = sp->req->handling;
@@ -1516,11 +1514,11 @@ cnt_recv(struct sess *sp)
 	     (recv_handling != VCL_RET_PIPE) &&
 	     (recv_handling != VCL_RET_PASS)) {
 		if (RFC2616_Req_Gzip(sp)) {
-			http_Unset(sp->http, H_Accept_Encoding);
-			http_SetHeader(wrk, sp->vsl_id, sp->http,
+			http_Unset(sp->req->http, H_Accept_Encoding);
+			http_SetHeader(wrk, sp->vsl_id, sp->req->http,
 			    "Accept-Encoding: gzip");
 		} else {
-			http_Unset(sp->http, H_Accept_Encoding);
+			http_Unset(sp->req->http, H_Accept_Encoding);
 		}
 	}
 
@@ -1529,7 +1527,7 @@ cnt_recv(struct sess *sp)
 	assert(sp->req->handling == VCL_RET_HASH);
 	SHA256_Final(sp->req->digest, wrk->sha256ctx);
 
-	if (!strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD"))
+	if (!strcmp(sp->req->http->hd[HTTP_HDR_REQ].b, "HEAD"))
 		sp->req->wantbody = 0;
 	else
 		sp->req->wantbody = 1;
@@ -1605,7 +1603,7 @@ cnt_start(struct sess *sp)
 	sp->req->vcl = wrk->vcl;
 	wrk->vcl = NULL;
 
-	http_Setup(sp->http, sp->ws);
+	http_Setup(sp->req->http, sp->req->ws);
 	done = http_DissectRequest(sp);
 
 	/* If we could not even parse the request, just close */
@@ -1616,10 +1614,10 @@ cnt_start(struct sess *sp)
 	}
 
 	/* Catch request snapshot */
-	sp->req->ws_req = WS_Snapshot(sp->ws);
+	sp->req->ws_req = WS_Snapshot(sp->req->ws);
 
 	/* Catch original request, before modification */
-	HTTP_Copy(sp->http0, sp->http);
+	HTTP_Copy(sp->req->http0, sp->req->http);
 
 	if (done != 0) {
 		sp->req->err_code = done;
@@ -1627,14 +1625,14 @@ cnt_start(struct sess *sp)
 		return (0);
 	}
 
-	sp->req->doclose = http_DoConnection(sp->http);
+	sp->req->doclose = http_DoConnection(sp->req->http);
 
 	/* XXX: Handle TRACE & OPTIONS of Max-Forwards = 0 */
 
 	/*
 	 * Handle Expect headers
 	 */
-	if (http_GetHdr(sp->http, H_Expect, &p)) {
+	if (http_GetHdr(sp->req->http, H_Expect, &p)) {
 		if (strcasecmp(p, "100-continue")) {
 			sp->req->err_code = 417;
 			sp->step = STP_ERROR;
@@ -1647,7 +1645,7 @@ cnt_start(struct sess *sp)
 		 * XXX: because we use http0 as our basis.  Believed
 		 * XXX: safe, but potentially confusing.
 		 */
-		http_Unset(sp->http, H_Expect);
+		http_Unset(sp->req->http, H_Expect);
 	}
 
 	sp->step = STP_RECV;
diff --git a/bin/varnishd/cache/cache_dir_dns.c b/bin/varnishd/cache/cache_dir_dns.c
index 517caaa..80310b9 100644
--- a/bin/varnishd/cache/cache_dir_dns.c
+++ b/bin/varnishd/cache/cache_dir_dns.c
@@ -350,7 +350,7 @@ vdi_dns_find_backend(const struct sess *sp, struct vdi_dns *vs)
 	if (sp->wrk->busyobj != NULL && sp->wrk->busyobj->bereq)
 		hp = sp->wrk->busyobj->bereq;
 	else
-		hp = sp->http;
+		hp = sp->req->http;
 
 
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index e1d3945..be8d185 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -63,17 +63,17 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	res_mode = sp->wrk->res_mode;
 
 	/* Reset request to status before we started messing with it */
-	HTTP_Copy(sp->http, sp->http0);
+	HTTP_Copy(sp->req->http, sp->req->http0);
 
 	/* Take a workspace snapshot */
-	sp_ws_wm = WS_Snapshot(sp->ws);
+	sp_ws_wm = WS_Snapshot(sp->req->ws);
 	wrk_ws_wm = WS_Snapshot(w->ws);
 
-	http_SetH(sp->http, HTTP_HDR_URL, src);
+	http_SetH(sp->req->http, HTTP_HDR_URL, src);
 	if (host != NULL && *host != '\0')  {
-		http_Unset(sp->http, H_Host);
-		http_Unset(sp->http, H_If_Modified_Since);
-		http_SetHeader(w, sp->vsl_id, sp->http, host);
+		http_Unset(sp->req->http, H_Host);
+		http_Unset(sp->req->http, H_If_Modified_Since);
+		http_SetHeader(w, sp->vsl_id, sp->req->http, host);
 	}
 	/*
 	 * XXX: We should decide if we should cache the director
@@ -82,14 +82,14 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	 */
 	sp->req->director = NULL;
 	sp->step = STP_RECV;
-	http_ForceGet(sp->http);
+	http_ForceGet(sp->req->http);
 
 	/* Don't do conditionals */
-	sp->http->conds = 0;
-	http_Unset(sp->http, H_If_Modified_Since);
+	sp->req->http->conds = 0;
+	http_Unset(sp->req->http, H_If_Modified_Since);
 
 	/* Client content already taken care of */
-	http_Unset(sp->http, H_Content_Length);
+	http_Unset(sp->req->http, H_Content_Length);
 
 	sxid = sp->req->xid;
 	while (1) {
@@ -110,7 +110,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	sp->wrk->res_mode = res_mode;
 
 	/* Reset the workspace */
-	WS_Reset(sp->ws, sp_ws_wm);
+	WS_Reset(sp->req->ws, sp_ws_wm);
 	WS_Reset(w->ws, wrk_ws_wm);
 
 	WRW_Reserve(sp->wrk, &sp->fd);
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index dbf30e6..1e75f64 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -336,7 +336,7 @@ FetchReqBody(struct sess *sp)
 	char *ptr, *endp;
 	int rdcnt;
 
-	if (http_GetHdr(sp->http, H_Content_Length, &ptr)) {
+	if (http_GetHdr(sp->req->http, H_Content_Length, &ptr)) {
 
 		content_length = strtoul(ptr, &endp, 10);
 		/* XXX should check result of conversion */
@@ -356,7 +356,7 @@ FetchReqBody(struct sess *sp)
 				return (2);
 		}
 	}
-	if (http_GetHdr(sp->http, H_Transfer_Encoding, NULL)) {
+	if (http_GetHdr(sp->req->http, H_Transfer_Encoding, NULL)) {
 		/* XXX: Handle chunked encoding. */
 		WSP(sp, SLT_Debug, "Transfer-Encoding in request");
 		return (1);
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index dbcca41..5d8c880 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -301,7 +301,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->http, HTTP_MAGIC);
 	AN(sp->req->director);
 	AN(hash);
 	wrk = sp->wrk;
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 93bd896..f7dad38 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -660,7 +660,7 @@ http_DissectRequest(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	htc = sp->req->htc;
 	CHECK_OBJ_NOTNULL(htc, HTTP_CONN_MAGIC);
-	hp = sp->http;
+	hp = sp->req->http;
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 
 	hp->logtag = HTTP_Rx;
@@ -873,13 +873,13 @@ http_FilterHeader(const struct sess *sp, unsigned how)
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 	hp->logtag = HTTP_Tx;
 
-	http_copyh(hp, sp->http, HTTP_HDR_REQ);
-	http_copyh(hp, sp->http, HTTP_HDR_URL);
+	http_copyh(hp, sp->req->http, HTTP_HDR_REQ);
+	http_copyh(hp, sp->req->http, HTTP_HDR_URL);
 	if (how == HTTPH_R_FETCH)
 		http_SetH(hp, HTTP_HDR_PROTO, "HTTP/1.1");
 	else
-		http_copyh(hp, sp->http, HTTP_HDR_PROTO);
-	http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->http, how);
+		http_copyh(hp, sp->req->http, HTTP_HDR_PROTO);
+	http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->req->http, how);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->req->xid);
 }
 
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 9710517..a35c258 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -265,8 +265,8 @@ pan_sess(const struct sess *sp)
 	if (sp->wrk->busyobj != NULL)
 		pan_busyobj(sp->wrk->busyobj);
 
-	pan_ws(sp->ws, 2);
-	pan_http("req", sp->http, 2);
+	pan_ws(sp->req->ws, 2);
+	pan_http("req", sp->req->http, 2);
 
 	if (sp->wrk != NULL)
 		pan_wrk(sp->wrk);
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index fe5f29f..6b2ea78 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -259,7 +259,7 @@ RES_WriteObj(struct sess *sp)
 	WRW_Reserve(sp->wrk, &sp->fd);
 
 	if (sp->wrk->obj->response == 200 &&
-	    sp->http->conds &&
+	    sp->req->http->conds &&
 	    RFC2616_Do_Cond(sp)) {
 		sp->req->wantbody = 0;
 		http_SetResp(sp->wrk->resp, "HTTP/1.1", 304, "Not Modified");
@@ -278,7 +278,7 @@ RES_WriteObj(struct sess *sp)
 	    !(sp->wrk->res_mode & (RES_ESI|RES_ESI_CHILD|RES_GUNZIP)) &&
 	    cache_param->http_range_support &&
 	    sp->wrk->obj->response == 200 &&
-	    http_GetHdr(sp->http, H_Range, &r))
+	    http_GetHdr(sp->req->http, H_Range, &r))
 		res_dorange(sp, r, &low, &high);
 
 	/*
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 5c5e5e2..04641ca 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -291,7 +291,7 @@ RFC2616_Req_Gzip(const struct sess *sp)
 	 * p104 says to not do q values for x-gzip, so we just test
 	 * for its existence.
 	 */
-	if (http_GetHdrData(sp->http, H_Accept_Encoding, "x-gzip", NULL))
+	if (http_GetHdrData(sp->req->http, H_Accept_Encoding, "x-gzip", NULL))
 		return (1);
 
 	/*
@@ -299,7 +299,7 @@ RFC2616_Req_Gzip(const struct sess *sp)
 	 * We do not care a hoot if the client prefers some other
 	 * compression more than gzip: Varnish only does gzip.
 	 */
-	if (http_GetHdrQ(sp->http, H_Accept_Encoding, "gzip") > 0.)
+	if (http_GetHdrQ(sp->req->http, H_Accept_Encoding, "gzip") > 0.)
 		return (1);
 
 	/* Bad client, no gzip. */
@@ -318,7 +318,7 @@ RFC2616_Do_Cond(const struct sess *sp)
 	/* RFC 2616 13.3.4 states we need to match both ETag
 	   and If-Modified-Since if present*/
 
-	if (http_GetHdr(sp->http, H_If_Modified_Since, &p) ) {
+	if (http_GetHdr(sp->req->http, H_If_Modified_Since, &p) ) {
 		if (!sp->wrk->obj->last_modified)
 			return (0);
 		ims = VTIM_parse(p);
@@ -329,7 +329,7 @@ RFC2616_Do_Cond(const struct sess *sp)
 		do_cond = 1;
 	}
 
-	if (http_GetHdr(sp->http, H_If_None_Match, &p) &&
+	if (http_GetHdr(sp->req->http, H_If_None_Match, &p) &&
 	    http_GetHdr(sp->wrk->obj->http, H_ETag, &e)) {
 		if (strcmp(p,e) != 0)
 			return (0);
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 42ce7df..92a7357 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -55,7 +55,6 @@ struct sessmem {
 	unsigned		workspace;
 	uint16_t		nhttp;
 	void			*wsp;
-	struct http		*http[2];
 	VTAILQ_ENTRY(sessmem)	list;
 
 	struct sess		sess;
@@ -69,7 +68,6 @@ struct sesspool {
 	struct lock		mtx;
 	unsigned		nsess;
 	unsigned		dly_free_cnt;
-	unsigned		req_size;
 	struct mempool		*mpl_req;
 };
 
@@ -82,6 +80,7 @@ SES_Charge(struct sess *sp)
 {
 	struct acct *a = &sp->wrk->acct_tmp;
 
+	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 	sp->req->req_bodybytes += a->bodybytes;
 
 #define ACCT(foo)				\
@@ -170,10 +169,6 @@ ses_setup(struct sessmem *sm)
 	sp->t_open = NAN;
 	sp->t_idle = NAN;
 	sp->t_req = NAN;
-
-	WS_Init(sp->ws, "sess", sm->wsp, sm->workspace);
-	sp->http = sm->http[0];
-	sp->http0 = sm->http[1];
 }
 
 /*--------------------------------------------------------------------
@@ -273,7 +268,7 @@ SES_Schedule(struct sess *sp)
 	if (Pool_Schedule(pp->pool, sp)) {
 		VSC_C_main->client_drop_late++;
 		sp->t_idle = VTIM_real();
-		if (sp->req->vcl != NULL) {
+		if (sp->req != NULL && sp->req->vcl != NULL) {
 			/*
 			 * A session parked on a busy object can come here
 			 * after it wakes up.  Loose the VCL reference.
@@ -391,19 +386,40 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 }
 
 /*--------------------------------------------------------------------
- * Alloc/Free/Clean sp->req
+ * Alloc/Free sp->req
  */
 
 void
 SES_GetReq(struct sess *sp)
 {
 	struct sesspool *pp;
+	uint16_t nhttp;
+	unsigned sz, hl;
+	char *p;
 
 	pp = ses_getpool(sp);
 	AZ(sp->req);
-	sp->req = MPL_Get(pp->mpl_req, NULL);
+	sp->req = MPL_Get(pp->mpl_req, &sz);
 	AN(sp->req);
 	sp->req->magic = REQ_MAGIC;
+
+	p = (char*)(sp->req + 1);
+	sz -= sizeof *sp->req;
+
+	nhttp = (uint16_t)cache_param->http_max_hdr;
+	hl = HTTP_estimate(nhttp);
+
+	xxxassert(sz > 2 * hl + 128);
+
+	sp->req->http = HTTP_create(p, nhttp);
+	p += hl;
+	sz -= hl;
+
+	sp->req->http0 = HTTP_create(p, nhttp);
+	p += hl;
+	sz -= hl;
+	
+	WS_Init(sp->req->ws, "req", p, sz);
 }
 
 void
@@ -434,8 +450,8 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
 	VTAILQ_INIT(&pp->freelist);
 	Lck_New(&pp->mtx, lck_sessmem);
 	bprintf(nb, "req%u", pool_no);
-	pp->req_size = sizeof (struct req);
-	pp->mpl_req = MPL_New(nb, &cache_param->req_pool, &pp->req_size);
+	pp->mpl_req = MPL_New(nb, &cache_param->req_pool,
+	    &cache_param->sess_workspace);
 	return (pp);
 }
 
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 562f6df..a5070cd 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -96,7 +96,7 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 		    (char)(1 + (q - p)), (int)(q - p), p, 0);
 		AZ(VSB_finish(sbh));
 
-		if (http_GetHdr(sp->http, VSB_data(sbh), &h)) {
+		if (http_GetHdr(sp->req->http, VSB_data(sbh), &h)) {
 			AZ(vct_issp(*h));
 			/* Trim trailing space */
 			e = strchr(h, '\0');
@@ -187,7 +187,7 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
 		if (i == 1) {
 			/* Build a new entry */
 
-			i = http_GetHdr(sp->http, (const char*)(vary+2), &h);
+			i = http_GetHdr(sp->req->http, (const char*)(vary+2), &h);
 			if (i) {
 				/* Trim trailing space */
 				e = strchr(h, '\0');
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index e078f8f..7f27e8b 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -97,7 +97,7 @@ vrt_selecthttp(const struct sess *sp, enum gethdr_e where)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	switch (where) {
 	case HDR_REQ:
-		hp = sp->http;
+		hp = sp->req->http;
 		break;
 	case HDR_BEREQ:
 		hp = sp->wrk->busyobj->bereq;
@@ -307,7 +307,7 @@ VRT_IP_string(const struct sess *sp, const struct sockaddr_storage *sa)
 		INCOMPL();
 	}
 	XXXAN(len);
-	AN(p = WS_Alloc(sp->http->ws, len));
+	AN(p = WS_Alloc(sp->req->http->ws, len));
 	AN(inet_ntop(sa->ss_family, addr, p, len));
 	return (p);
 }
@@ -319,7 +319,7 @@ VRT_int_string(const struct sess *sp, int num)
 	int size;
 
 	size = snprintf(NULL, 0, "%d", num) + 1;
-	AN(p = WS_Alloc(sp->http->ws, size));
+	AN(p = WS_Alloc(sp->req->http->ws, size));
 	assert(snprintf(p, size, "%d", num) < size);
 	return (p);
 }
@@ -331,7 +331,7 @@ VRT_double_string(const struct sess *sp, double num)
 	int size;
 
 	size = snprintf(NULL, 0, "%.3f", num) + 1;
-	AN(p = WS_Alloc(sp->http->ws, size));
+	AN(p = WS_Alloc(sp->req->http->ws, size));
 	assert(snprintf(p, size, "%.3f", num) < size);
 	return (p);
 }
@@ -341,7 +341,7 @@ VRT_time_string(const struct sess *sp, double t)
 {
 	char *p;
 
-	AN(p = WS_Alloc(sp->http->ws, VTIM_FORMAT_SIZE));
+	AN(p = WS_Alloc(sp->req->http->ws, VTIM_FORMAT_SIZE));
 	VTIM_format(t, p);
 	return (p);
 }
@@ -371,8 +371,8 @@ void
 VRT_Rollback(struct sess *sp)
 {
 
-	HTTP_Copy(sp->http, sp->http0);
-	WS_Reset(sp->ws, sp->req->ws_req);
+	HTTP_Copy(sp->req->http, sp->req->http0);
+	WS_Reset(sp->req->ws, sp->req->ws_req);
 }
 
 /*--------------------------------------------------------------------*/
@@ -384,7 +384,7 @@ VRT_panic(const struct sess *sp, const char *str, ...)
 	char *b;
 
 	va_start(ap, str);
-	b = VRT_String(sp->http->ws, "PANIC: ", str, ap);
+	b = VRT_String(sp->req->http->ws, "PANIC: ", str, ap);
 	va_end(ap);
 	VAS_Fail("VCL", "", 0, b, 0, 2);
 }
diff --git a/bin/varnishd/cache/cache_vrt_re.c b/bin/varnishd/cache/cache_vrt_re.c
index e9ac9de..9864611 100644
--- a/bin/varnishd/cache/cache_vrt_re.c
+++ b/bin/varnishd/cache/cache_vrt_re.c
@@ -110,8 +110,8 @@ VRT_regsub(const struct sess *sp, int all, const char *str, void *re,
 		return(str);
 	}
 
-	u = WS_Reserve(sp->http->ws, 0);
-	res.e = res.b = b0 = sp->http->ws->f;
+	u = WS_Reserve(sp->req->http->ws, 0);
+	res.e = res.b = b0 = sp->req->http->ws->f;
 	res.e += u;
 
 	do {
@@ -143,7 +143,7 @@ VRT_regsub(const struct sess *sp, int all, const char *str, void *re,
 		i = VRE_exec(t, str, len, 0, options, ovector, 30,
 		    &cache_param->vre_limits);
 		if (i < VRE_ERROR_NOMATCH ) {
-			WS_Release(sp->http->ws, 0);
+			WS_Release(sp->req->http->ws, 0);
 			WSP(sp, SLT_VCL_Error,
 			    "Regexp matching returned %d", i);
 			return(str);
@@ -153,10 +153,10 @@ VRT_regsub(const struct sess *sp, int all, const char *str, void *re,
 	/* Copy suffix to match */
 	Tadd(&res, str, len+1);
 	if (res.b >= res.e) {
-		WS_Release(sp->http->ws, 0);
+		WS_Release(sp->req->http->ws, 0);
 		return (str);
 	}
 	Tcheck(res);
-	WS_ReleaseP(sp->http->ws, res.b);
+	WS_ReleaseP(sp->req->http->ws, res.b);
 	return (b0);
 }
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 7ac9768..d128818 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -82,9 +82,9 @@ VRT_r_##obj##_##hdr(const struct sess *sp)			\
 	return (http->hd[fld].b);				\
 }
 
-VRT_DO_HDR(req,   request,	sp->http,		HTTP_HDR_REQ)
-VRT_DO_HDR(req,   url,		sp->http,		HTTP_HDR_URL)
-VRT_DO_HDR(req,   proto,	sp->http,		HTTP_HDR_PROTO)
+VRT_DO_HDR(req,   request,	sp->req->http,		HTTP_HDR_REQ)
+VRT_DO_HDR(req,   url,		sp->req->http,		HTTP_HDR_URL)
+VRT_DO_HDR(req,   proto,	sp->req->http,		HTTP_HDR_PROTO)
 VRT_DO_HDR(bereq, request,	sp->wrk->busyobj->bereq,	HTTP_HDR_REQ)
 VRT_DO_HDR(bereq, url,		sp->wrk->busyobj->bereq,	HTTP_HDR_URL)
 VRT_DO_HDR(bereq, proto,	sp->wrk->busyobj->bereq,	HTTP_HDR_PROTO)
@@ -222,7 +222,7 @@ VRT_l_client_identity(struct sess *sp, const char *str, ...)
 	char *b;
 
 	va_start(ap, str);
-	b = VRT_String(sp->http->ws, NULL, str, ap);
+	b = VRT_String(sp->req->http->ws, NULL, str, ap);
 	va_end(ap);
 	sp->req->client_identity = b;
 }
@@ -434,7 +434,7 @@ VRT_r_req_xid(struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
 	size = snprintf(NULL, 0, "%u", sp->req->xid) + 1;
-	AN(p = WS_Alloc(sp->http->ws, size));
+	AN(p = WS_Alloc(sp->req->http->ws, size));
 	assert(snprintf(p, size, "%u", sp->req->xid) < size);
 	return (p);
 }
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 2f7bd53..81aaf0d 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -688,7 +688,7 @@ static const struct parspec input_parspec[] = {
 		0,
 		"120", "seconds" },
 	{ "sess_workspace",
-		tweak_bytes_u, &mgt_param.sess_workspace, 1024, UINT_MAX,
+		tweak_bytes_u, &mgt_param.sess_workspace, 3072, UINT_MAX,
 		"Bytes of HTTP protocol workspace allocated for sessions. "
 		"This space must be big enough for the entire HTTP protocol "
 		"header and any edits done to it in the VCL code.\n"



From phk at varnish-cache.org  Sun Dec 25 10:09:37 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 11:09:37 +0100
Subject: [master] e2081b7 Consequence changes of http/ws moving to struct req
Message-ID: <E1Rel1N-0006Ra-PX@project.varnish-software.com>

commit e2081b7df599b83e31d486a1896f1dd9f8d7ac01
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 10:09:19 2011 +0000

    Consequence changes of http/ws moving to struct req

diff --git a/bin/varnishtest/tests/r00693.vtc b/bin/varnishtest/tests/r00693.vtc
index ce65be5..24b6827 100644
--- a/bin/varnishtest/tests/r00693.vtc
+++ b/bin/varnishtest/tests/r00693.vtc
@@ -17,7 +17,7 @@ server s1 {
 
 } -start
 
-varnish v1 -arg "-p sess_workspace=1024" -vcl+backend {
+varnish v1 -arg "-p sess_workspace=3072" -vcl+backend {
 
 	sub vcl_recv {
 		set req.http.foo = 
@@ -35,23 +35,6 @@ varnish v1 -arg "-p sess_workspace=1024" -vcl+backend {
 			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
 			"0123456789abcde";
 		set req.http.baz = "BAZ";
 		return (pass);



From phk at varnish-cache.org  Sun Dec 25 10:10:04 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 11:10:04 +0100
Subject: [master] 8129edf Forgot to commit the vmod_std changes.
Message-ID: <E1Rel1o-0006br-EI@project.varnish-software.com>

commit 8129edff14a76b76caf19ca5dc3cfc9ba92891ae
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 10:09:48 2011 +0000

    Forgot to commit the vmod_std changes.

diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index fc371e7..b2ab419 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -191,7 +191,7 @@ vmod_collect(struct sess *sp, enum gethdr_e e, const char *h)
 	(void)sp;
 	(void)h;
 	if (e == HDR_REQ)
-		http_CollectHdr(sp->http, h);
+		http_CollectHdr(sp->req->http, h);
 	else if (e == HDR_BERESP && sp->wrk->busyobj != NULL)
 		http_CollectHdr(sp->wrk->busyobj->beresp, h);
 }



From phk at varnish-cache.org  Sun Dec 25 10:29:28 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 11:29:28 +0100
Subject: [master] ac2e067 Remove the old sessmem allocator/freelist stuff,
	and replace with a run of the mill mempool.
Message-ID: <E1RelKa-0007zL-Il@project.varnish-software.com>

commit ac2e067b0daced3cc24b16b0b14b7be10c5ceb27
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 10:28:52 2011 +0000

    Remove the old sessmem allocator/freelist stuff, and replace with
    a run of the mill mempool.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index d1dc4fb..9743398 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -634,9 +634,9 @@ struct sess {
 
 	/* Cross references ------------------------------------------*/
 
+	struct sesspool		*sesspool;
 	struct worker		*wrk;
 	struct req		*req;
-	struct sessmem		*mem;
 
 	/* Session related fields ------------------------------------*/
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 92a7357..552c078 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -44,31 +44,16 @@
 #include "waiter/waiter.h"
 #include "vtim.h"
 
-/*--------------------------------------------------------------------*/
-
-struct sessmem {
-	unsigned		magic;
-#define SESSMEM_MAGIC		0x555859c5
-
-	struct sesspool		*pool;
-
-	unsigned		workspace;
-	uint16_t		nhttp;
-	void			*wsp;
-	VTAILQ_ENTRY(sessmem)	list;
+static unsigned ses_size = sizeof (struct sess);
 
-	struct sess		sess;
-};
+/*--------------------------------------------------------------------*/
 
 struct sesspool {
 	unsigned		magic;
 #define SESSPOOL_MAGIC		0xd916e202
 	struct pool		*pool;
-	VTAILQ_HEAD(,sessmem)	freelist;
-	struct lock		mtx;
-	unsigned		nsess;
-	unsigned		dly_free_cnt;
 	struct mempool		*mpl_req;
+	struct mempool		*mpl_sess;
 };
 
 /*--------------------------------------------------------------------
@@ -92,77 +77,14 @@ SES_Charge(struct sess *sp)
 }
 
 /*--------------------------------------------------------------------
- * This function allocates a session + assorted peripheral data
- * structures in one single malloc operation.
- */
-
-static struct sessmem *
-ses_sm_alloc(void)
-{
-	struct sessmem *sm;
-	unsigned char *p, *q;
-	unsigned nws;
-	uint16_t nhttp;
-	unsigned l, hl;
-
-	/*
-	 * It is not necessary to lock these, but we need to
-	 * cache them locally, to make sure we get a consistent
-	 * view of the value.
-	 */
-	nws = cache_param->sess_workspace;
-	nhttp = (uint16_t)cache_param->http_max_hdr;
-
-	hl = HTTP_estimate(nhttp);
-	l = sizeof *sm + nws + 2 * hl;
-	VSC_C_main->sessmem_size = l;
-	p = malloc(l);
-	if (p == NULL)
-		return (NULL);
-	q = p + l;
-
-	/* Don't waste time zeroing the workspace */
-	memset(p, 0, l - nws);
-
-	sm = (void*)p;
-	p += sizeof *sm;
-
-	sm->magic = SESSMEM_MAGIC;
-	sm->workspace = nws;
-	sm->nhttp = nhttp;
-
-	sm->http[0] = HTTP_create(p, nhttp);
-	p += hl;
-
-	sm->http[1] = HTTP_create(p, nhttp);
-	p += hl;
-
-	sm->wsp = p;
-	p += nws;
-
-	assert(p == q);
-
-	return (sm);
-}
-
-/*--------------------------------------------------------------------
  * This prepares a session for use, based on its sessmem structure.
  */
 
 static void
-ses_setup(struct sessmem *sm)
+ses_setup(struct sess *sp)
 {
-	struct sess *sp;
-
-	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-	sp = &sm->sess;
-	memset(sp, 0, sizeof *sp);
 
-	/* We assume that the sess has been zeroed by the time we get here */
-	AZ(sp->magic);
-
-	sp->magic = SESS_MAGIC;
-	sp->mem = sm;
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	sp->sockaddrlen = sizeof(sp->sockaddr);
 	sp->mysockaddrlen = sizeof(sp->mysockaddr);
 	sp->sockaddr.ss_family = sp->mysockaddr.ss_family = PF_UNSPEC;
@@ -178,39 +100,14 @@ ses_setup(struct sessmem *sm)
 struct sess *
 SES_New(struct worker *wrk, struct sesspool *pp)
 {
-	struct sessmem *sm;
 	struct sess *sp;
-	int do_alloc;
 
+	(void)wrk;					// XXX
 	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
-
-	do_alloc = 0;
-	Lck_Lock(&pp->mtx);
-	sm = VTAILQ_FIRST(&pp->freelist);
-	if (sm != NULL) {
-		VTAILQ_REMOVE(&pp->freelist, sm, list);
-	} else if (pp->nsess < cache_param->max_sess) {
-		pp->nsess++;
-		do_alloc = 1;
-	}
-	wrk->stats.sessmem_free += pp->dly_free_cnt;
-	pp->dly_free_cnt = 0;
-	Lck_Unlock(&pp->mtx);
-	if (do_alloc) {
-		sm = ses_sm_alloc();
-		if (sm != NULL) {
-			wrk->stats.sessmem_alloc++;
-			sm->pool = pp;
-			ses_setup(sm);
-		} else {
-			wrk->stats.sessmem_fail++;
-		}
-	} else if (sm == NULL) {
-		wrk->stats.sessmem_limit++;
-	}
-	if (sm == NULL)
-		return (NULL);
-	sp = &sm->sess;
+	sp = MPL_Get(pp->mpl_sess, NULL);
+	sp->magic = SESS_MAGIC;
+	sp->sesspool = pp;
+	ses_setup(sp);
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	return (sp);
 }
@@ -223,35 +120,15 @@ struct sess *
 SES_Alloc(void)
 {
 	struct sess *sp;
-	struct sessmem *sm;
 
-	sm = ses_sm_alloc();
-	AN(sm);
-	ses_setup(sm);
-	sp = &sm->sess;
-	sp->sockaddrlen = 0;
+	ALLOC_OBJ(sp, SESS_MAGIC);
+	AN(sp);
+	ses_setup(sp);
 	/* XXX: sp->req ? */
 	return (sp);
 }
 
 /*--------------------------------------------------------------------
- */
-
-static struct sesspool *
-ses_getpool(const struct sess *sp)
-{
-	struct sessmem *sm;
-	struct sesspool *pp;
-
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	sm = sp->mem;
-	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-	pp = sm->pool;
-	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
-	return (pp);
-}
-
-/*--------------------------------------------------------------------
  * Schedule a session back on a work-thread from its pool
  */
 
@@ -260,9 +137,10 @@ SES_Schedule(struct sess *sp)
 {
 	struct sesspool *pp;
 
-	pp = ses_getpool(sp);
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	AZ(sp->wrk);
-
+	pp = sp->sesspool;
+	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
 	AN(pp->pool);
 
 	if (Pool_Schedule(pp->pool, sp)) {
@@ -325,14 +203,14 @@ void
 SES_Delete(struct sess *sp, const char *reason, double now)
 {
 	struct acct *b;
-	struct sessmem *sm;
 	struct worker *wrk;
 	struct sesspool *pp;
 
-	pp = ses_getpool(sp);
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	pp = sp->sesspool;
+	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
+	AN(pp->pool);
 
-	sm = sp->mem;
-	CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
 	wrk = sp->wrk;
 	CHECK_OBJ_ORNULL(wrk, WORKER_MAGIC);
 
@@ -361,28 +239,8 @@ SES_Delete(struct sess *sp, const char *reason, double now)
 	    b->sess, b->req, b->pipe, b->pass,
 	    b->fetch, b->hdrbytes, b->bodybytes);
 
-	if (sm->workspace != cache_param->sess_workspace ||
-	    sm->nhttp != (uint16_t)cache_param->http_max_hdr ||
-	    pp->nsess > cache_param->max_sess) {
-		free(sm);
-		Lck_Lock(&pp->mtx);
-		if (wrk != NULL)
-			wrk->stats.sessmem_free++;
-		else
-			pp->dly_free_cnt++;
-		pp->nsess--;
-		Lck_Unlock(&pp->mtx);
-	} else {
-		/* Clean and prepare for reuse */
-		ses_setup(sm);
-		Lck_Lock(&pp->mtx);
-		if (wrk != NULL) {
-			wrk->stats.sessmem_free += pp->dly_free_cnt;
-			pp->dly_free_cnt = 0;
-		}
-		VTAILQ_INSERT_HEAD(&pp->freelist, sm, list);
-		Lck_Unlock(&pp->mtx);
-	}
+	MPL_Free(pp->mpl_sess, sp);
+
 }
 
 /*--------------------------------------------------------------------
@@ -397,7 +255,11 @@ SES_GetReq(struct sess *sp)
 	unsigned sz, hl;
 	char *p;
 
-	pp = ses_getpool(sp);
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	pp = sp->sesspool;
+	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
+	AN(pp->pool);
+
 	AZ(sp->req);
 	sp->req = MPL_Get(pp->mpl_req, &sz);
 	AN(sp->req);
@@ -427,7 +289,10 @@ SES_ReleaseReq(struct sess *sp)
 {
 	struct sesspool *pp;
 
-	pp = ses_getpool(sp);
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	pp = sp->sesspool;
+	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
+	AN(pp->pool);
 	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
 	MPL_AssertSane(sp->req);
 	MPL_Free(pp->mpl_req, sp->req);
@@ -447,33 +312,20 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
 	ALLOC_OBJ(pp, SESSPOOL_MAGIC);
 	AN(pp);
 	pp->pool = wp;
-	VTAILQ_INIT(&pp->freelist);
-	Lck_New(&pp->mtx, lck_sessmem);
 	bprintf(nb, "req%u", pool_no);
 	pp->mpl_req = MPL_New(nb, &cache_param->req_pool,
 	    &cache_param->sess_workspace);
+	pp->mpl_sess = MPL_New(nb, &cache_param->sess_pool, &ses_size);
 	return (pp);
 }
 
 void
 SES_DeletePool(struct sesspool *pp, struct worker *wrk)
 {
-	struct sessmem *sm;
 
 	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	Lck_Lock(&pp->mtx);
-	while (!VTAILQ_EMPTY(&pp->freelist)) {
-		sm = VTAILQ_FIRST(&pp->freelist);
-		CHECK_OBJ_NOTNULL(sm, SESSMEM_MAGIC);
-		VTAILQ_REMOVE(&pp->freelist, sm, list);
-		FREE_OBJ(sm);
-		wrk->stats.sessmem_free++;
-		pp->nsess--;
-	}
-	AZ(pp->nsess);
-	Lck_Unlock(&pp->mtx);
-	Lck_Delete(&pp->mtx);
+	MPL_Destroy(&pp->mpl_sess);
 	MPL_Destroy(&pp->mpl_req);
 	FREE_OBJ(pp);
 }
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index 0a476d4..ca39ff7 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -201,4 +201,5 @@ struct params {
 
 	struct poolparam	vbc_pool;
 	struct poolparam	req_pool;
+	struct poolparam	sess_pool;
 };
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 81aaf0d..36f96cd 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1221,6 +1221,14 @@ static const struct parspec input_parspec[] = {
 		"   max_age -- max age of free element.\n",
 		0,
 		"10,100,10", ""},
+	{ "pool_sess", tweak_poolparam, &mgt_param.sess_pool, 0, 10000,
+		"Parameters for per worker pool session memory pool.\n"
+		"The three numbers are:\n"
+		"   min_pool -- minimum size of free pool.\n"
+		"   max_pool -- maximum size of free pool.\n"
+		"   max_age -- max age of free element.\n",
+		0,
+		"10,100,10", ""},
 
 	{ NULL, NULL, NULL }
 };



From phk at varnish-cache.org  Sun Dec 25 10:57:23 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 11:57:23 +0100
Subject: [master] ff61fc3 Rename the 'sess_workspace' param to
	'workspace_client'.
Message-ID: <E1Rellb-0001iR-CE@project.varnish-software.com>

commit ff61fc3496a5f299617c7a026f10d129ef0e9297
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 10:55:47 2011 +0000

    Rename the 'sess_workspace' param to 'workspace_client'.
    
    I'm not quite there yet, but in the end we will have two workspaces:
    req->ws for req.* and resp.* and busyobj->ws for bereq.* and beresp.*
    
    Various argument changes as consequence of the sess->req moves.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 9743398..50c1ec0 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -761,7 +761,7 @@ int FetchError(struct worker *w, const char *error);
 int FetchError2(struct worker *w, const char *error, const char *more);
 int FetchHdr(struct sess *sp, int need_host_hdr);
 int FetchBody(struct worker *w, struct object *obj);
-int FetchReqBody(struct sess *sp);
+int FetchReqBody(const struct sess *sp);
 void Fetch_Init(void);
 
 /* cache_gzip.c */
@@ -825,7 +825,7 @@ double http_GetHdrQ(const struct http *hp, const char *hdr, const char *field);
 uint16_t http_GetStatus(const struct http *hp);
 const char *http_GetReq(const struct http *hp);
 int http_HdrIs(const struct http *hp, const char *hdr, const char *val);
-uint16_t http_DissectRequest(struct sess *sp);
+uint16_t http_DissectRequest(const struct sess *sp);
 uint16_t http_DissectResponse(struct worker *w, const struct http_conn *htc,
     struct http *sp);
 const char *http_DoConnection(const struct http *hp);
@@ -910,13 +910,13 @@ void WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len);
 #endif  /* SENDFILE_WORKS */
 
 /* cache_session.c [SES] */
-struct sess *SES_New(struct worker *wrk, struct sesspool *pp);
+struct sess *SES_New(struct sesspool *pp);
 struct sess *SES_Alloc(void);
 void SES_Close(struct sess *sp, const char *reason);
 void SES_Delete(struct sess *sp, const char *reason, double now);
 void SES_Charge(struct sess *sp);
 struct sesspool *SES_NewPool(struct pool *pp, unsigned pool_no);
-void SES_DeletePool(struct sesspool *sp, struct worker *wrk);
+void SES_DeletePool(struct sesspool *sp);
 int SES_Schedule(struct sess *sp);
 void SES_Handle(struct sess *sp, double now);
 void SES_GetReq(struct sess *sp);
@@ -966,7 +966,7 @@ void RES_StreamPoll(struct worker *);
 
 /* cache_vary.c */
 struct vsb *VRY_Create(const struct sess *sp, const struct http *hp);
-int VRY_Match(struct sess *sp, const uint8_t *vary);
+int VRY_Match(const struct sess *sp, const uint8_t *vary);
 void VRY_Validate(const uint8_t *vary);
 
 /* cache_vcl.c */
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 9162f50..a884983 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -618,9 +618,11 @@ ban_evaluate(const uint8_t *bs, const struct http *objhttp,
 		arg1 = NULL;
 		switch (bt.arg1) {
 		case BAN_ARG_URL:
+			AN(reqhttp);
 			arg1 = reqhttp->hd[HTTP_HDR_URL].b;
 			break;
 		case BAN_ARG_REQHTTP:
+			AN(reqhttp);
 			(void)http_GetHdr(reqhttp, bt.arg1_spec, &arg1);
 			break;
 		case BAN_ARG_OBJHTTP:
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 1e75f64..2e65591 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -329,7 +329,7 @@ fetch_eof(struct worker *wrk, struct http_conn *htc)
  */
 
 int
-FetchReqBody(struct sess *sp)
+FetchReqBody(const struct sess *sp)
 {
 	unsigned long content_length;
 	char buf[8192];
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index f7dad38..cb17df4 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -651,7 +651,7 @@ http_ProtoVer(struct http *hp)
 /*--------------------------------------------------------------------*/
 
 uint16_t
-http_DissectRequest(struct sess *sp)
+http_DissectRequest(const struct sess *sp)
 {
 	struct http_conn *htc;
 	struct http *hp;
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 1a67548..8ab73fe 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -238,7 +238,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			/* Turn accepted socket into a session */
 			AZ(w->sp);
 			AN(w->ws->r);
-			w->sp = SES_New(w, pp->sesspool);
+			w->sp = SES_New(pp->sesspool);
 			if (w->sp == NULL) {
 				VCA_FailSess(w);
 				w->do_what = pool_do_nothing;
@@ -538,7 +538,7 @@ pool_poolherder(void *priv)
 		}
 		/* XXX: remove pools */
 		if (0)
-			SES_DeletePool(NULL, NULL);
+			SES_DeletePool(NULL);
 		(void)sleep(1);
 		u = 0;
 		VTAILQ_FOREACH(pp, &pools, list)
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 552c078..0091407 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -98,11 +98,10 @@ ses_setup(struct sess *sp)
  */
 
 struct sess *
-SES_New(struct worker *wrk, struct sesspool *pp)
+SES_New(struct sesspool *pp)
 {
 	struct sess *sp;
 
-	(void)wrk;					// XXX
 	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
 	sp = MPL_Get(pp->mpl_sess, NULL);
 	sp->magic = SESS_MAGIC;
@@ -280,7 +279,7 @@ SES_GetReq(struct sess *sp)
 	sp->req->http0 = HTTP_create(p, nhttp);
 	p += hl;
 	sz -= hl;
-	
+
 	WS_Init(sp->req->ws, "req", p, sz);
 }
 
@@ -314,17 +313,16 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
 	pp->pool = wp;
 	bprintf(nb, "req%u", pool_no);
 	pp->mpl_req = MPL_New(nb, &cache_param->req_pool,
-	    &cache_param->sess_workspace);
+	    &cache_param->workspace_client);
 	pp->mpl_sess = MPL_New(nb, &cache_param->sess_pool, &ses_size);
 	return (pp);
 }
 
 void
-SES_DeletePool(struct sesspool *pp, struct worker *wrk)
+SES_DeletePool(struct sesspool *pp)
 {
 
 	CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
-	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	MPL_Destroy(&pp->mpl_sess);
 	MPL_Destroy(&pp->mpl_req);
 	FREE_OBJ(pp);
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index a5070cd..d524fd3 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -174,7 +174,7 @@ vry_cmp(const uint8_t * const *v1, uint8_t * const *v2)
 }
 
 int
-VRY_Match(struct sess *sp, const uint8_t *vary)
+VRY_Match(const struct sess *sp, const uint8_t *vary)
 {
 	uint8_t *vsp = sp->req->vary_b;
 	char *h, *e;
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index ca39ff7..6c1899a 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -75,7 +75,7 @@ struct params {
 	unsigned		queue_max;
 
 	/* Memory allocation hints */
-	unsigned		sess_workspace;
+	unsigned		workspace_client;
 	unsigned		shm_workspace;
 	unsigned		http_req_size;
 	unsigned		http_req_hdr_len;
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 36f96cd..c488f23 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -687,12 +687,9 @@ static const struct parspec input_parspec[] = {
 		"flush of the cache use \"ban.url .\"",
 		0,
 		"120", "seconds" },
-	{ "sess_workspace",
-		tweak_bytes_u, &mgt_param.sess_workspace, 3072, UINT_MAX,
-		"Bytes of HTTP protocol workspace allocated for sessions. "
-		"This space must be big enough for the entire HTTP protocol "
-		"header and any edits done to it in the VCL code.\n"
-		"Minimum is 1024 bytes.",
+	{ "workspace_client",
+		tweak_bytes_u, &mgt_param.workspace_client, 3072, UINT_MAX,
+		"Bytes of HTTP protocol workspace for clients HTTP req/resp.",
 		DELAYED_EFFECT,
 		"64k", "bytes" },
 	{ "http_req_hdr_len",
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index 39302b4..897f3ee 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -14,7 +14,7 @@ server s1 {
 	}
 } -start
 
-varnish v1 -arg "-p sess_workspace=131072 -p thread_pool_stack=262144" -vcl+backend {
+varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}
diff --git a/bin/varnishtest/tests/r00693.vtc b/bin/varnishtest/tests/r00693.vtc
index 24b6827..ff99ca7 100644
--- a/bin/varnishtest/tests/r00693.vtc
+++ b/bin/varnishtest/tests/r00693.vtc
@@ -17,7 +17,7 @@ server s1 {
 
 } -start
 
-varnish v1 -arg "-p sess_workspace=3072" -vcl+backend {
+varnish v1 -arg "-p workspace_client=3072" -vcl+backend {
 
 	sub vcl_recv {
 		set req.http.foo = 
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index d63b187..4963b7d 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -145,36 +145,6 @@ VSC_F(fetch_204,		uint64_t, 1, 'a', "Fetch no body (204)", "")
 VSC_F(fetch_304,		uint64_t, 1, 'a', "Fetch no body (304)", "")
 
 /*---------------------------------------------------------------------
- * Session Memory
- *    see: cache_session.c
- */
-
-VSC_F(sessmem_size,		uint64_t, 1, 'g',
-    "Session mem size",
-	"Bytes of memory allocated for last allocated session."
-)
-
-VSC_F(sessmem_alloc,		uint64_t, 1, 'c',
-    "Session mem allocated",
-	"Count of all allocations of session memory."
-)
-
-VSC_F(sessmem_free,		uint64_t, 1, 'c',
-    "Session mem freed",
-	"Count of all frees of session memory."
-)
-
-VSC_F(sessmem_fail,		uint64_t, 1, 'c',
-    "Session mem alloc failed",
-	"Count of session memory allocation failures."
-)
-
-VSC_F(sessmem_limit,		uint64_t, 1, 'c',
-    "Session mem alloc limited",
-	"Count of session memory allocations blocked by limit (max_sess)."
-)
-
-/*---------------------------------------------------------------------
  * Pools, threads, and sessions
  *    see: cache_pool.c
  *
@@ -252,8 +222,6 @@ VSC_F(busyobj_free,		uint64_t, 1, 'c',
 
 /*---------------------------------------------------------------------*/
 
-VSC_F(n_sess_mem,		uint64_t, 0, 'i', "N struct sess_mem", "")
-VSC_F(n_sess,			uint64_t, 0, 'i', "N struct sess", "")
 VSC_F(n_object,			uint64_t, 1, 'i', "N struct object", "")
 VSC_F(n_vampireobject,		uint64_t, 1, 'i', "N unresurrected objects", "")
 VSC_F(n_objectcore,		uint64_t, 1, 'i', "N struct objectcore", "")



From phk at varnish-cache.org  Sun Dec 25 11:05:21 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 12:05:21 +0100
Subject: [master] 718e877 Wrap lines
Message-ID: <E1ReltJ-0002cM-72@project.varnish-software.com>

commit 718e87721891249567bac736ea5e03c11ee63f77
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 11:05:14 2011 +0000

    Wrap lines

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 0b3c261..24aedb4 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -348,7 +348,8 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
 			/* XXX locking of stats */
 			VSC_C_main->backend_reuse += 1;
 			WSP(sp, SLT_Backend, "%d %s %s",
-			    vc->fd, sp->req->director->vcl_name, bp->display_name);
+			    vc->fd, sp->req->director->vcl_name,
+			    bp->display_name);
 			vc->vdis = vs;
 			vc->recycled = 1;
 			return (vc);
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 5d8c880..9f2c053 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -307,7 +307,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	wrk = sp->wrk;
 
 	HSH_Prealloc(sp);
-	memcpy(sp->wrk->nobjhead->digest, sp->req->digest, sizeof sp->req->digest);
+	memcpy(sp->wrk->nobjhead->digest, sp->req->digest,
+	    sizeof sp->req->digest);
 	if (cache_param->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
 
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index cb17df4..f441ef2 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -880,7 +880,8 @@ http_FilterHeader(const struct sess *sp, unsigned how)
 	else
 		http_copyh(hp, sp->req->http, HTTP_HDR_PROTO);
 	http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->req->http, how);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->req->xid);
+	http_PrintfHeader(sp->wrk, sp->vsl_id, hp,
+	    "X-Varnish: %u", sp->req->xid);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index a8282d7..21fefef 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -84,7 +84,8 @@ PipeSession(struct sess *sp)
 
 	if (sp->req->htc->pipeline.b != NULL)
 		sp->wrk->acct_tmp.bodybytes +=
-		    WRW_Write(w, sp->req->htc->pipeline.b, Tlen(sp->req->htc->pipeline));
+		    WRW_Write(w, sp->req->htc->pipeline.b,
+		    Tlen(sp->req->htc->pipeline));
 
 	i = WRW_FlushRelease(w);
 
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 6b2ea78..2398e5b 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -139,7 +139,8 @@ RES_BuildHttp(const struct sess *sp)
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
 		    "X-Varnish: %u", sp->req->xid);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
-	    sp->wrk->obj->exp.age + sp->req->t_resp - sp->wrk->obj->exp.entered);
+	    sp->wrk->obj->exp.age + sp->req->t_resp -
+	    sp->wrk->obj->exp.entered);
 	http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
 	    sp->req->doclose ? "close" : "keep-alive");
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index d524fd3..453b52d 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -187,7 +187,8 @@ VRY_Match(const struct sess *sp, const uint8_t *vary)
 		if (i == 1) {
 			/* Build a new entry */
 
-			i = http_GetHdr(sp->req->http, (const char*)(vary+2), &h);
+			i = http_GetHdr(sp->req->http,
+			    (const char*)(vary+2), &h);
 			if (i) {
 				/* Trim trailing space */
 				e = strchr(h, '\0');
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 4cf61c4..ad5acf0 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -334,12 +334,12 @@ VCL_##func##_method(struct sess *sp)					\
 {									\
 									\
 	sp->req->handling = 0;						\
-	sp->req->cur_method = VCL_MET_ ## upper;				\
+	sp->req->cur_method = VCL_MET_ ## upper;			\
 	WSP(sp, SLT_VCL_call, "%s", #func);				\
-	(void)sp->req->vcl->func##_func(sp);					\
-	WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling));	\
-	sp->req->cur_method = 0;						\
-	assert((1U << sp->req->handling) & bitmap);				\
+	(void)sp->req->vcl->func##_func(sp);				\
+	WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling)); \
+	sp->req->cur_method = 0;					\
+	assert((1U << sp->req->handling) & bitmap);			\
 	assert(!((1U << sp->req->handling) & ~bitmap));			\
 }
 



From phk at varnish-cache.org  Sun Dec 25 14:23:21 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 15:23:21 +0100
Subject: [master] 372312e Move resp.* to workspace_client and struct req
Message-ID: <E1Reoyv-0002fa-IP@project.varnish-software.com>

commit 372312e0fc5047be926ff7a5d6dc501fe578628d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 14:22:32 2011 +0000

    Move resp.* to workspace_client and struct req
    
    Retire a tiresome testcase to .disabled.
    
    Constify some VRT prototypes.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 50c1ec0..c048b5a 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -329,9 +329,6 @@ struct worker {
 
 	struct ws		ws[1];
 
-
-	struct http		*resp;
-
 	struct object		*obj;
 	struct objcore		*objcore;
 	struct busyobj		*busyobj;
@@ -622,6 +619,7 @@ struct req {
 	/* HTTP request */
 	struct http		*http;
 	struct http		*http0;
+	struct http		*resp;
 
 	struct ws		ws[1];
 };
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 6bf3f6a..0154577 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -281,7 +281,7 @@ cnt_prepresp(struct sess *sp)
 			wrk->obj->last_lru = sp->req->t_resp;
 		wrk->obj->last_use = sp->req->t_resp;	/* XXX: locking ? */
 	}
-	http_Setup(wrk->resp, wrk->ws);
+	http_Setup(sp->req->resp, sp->req->ws);
 	RES_BuildHttp(sp);
 	VCL_deliver_method(sp);
 	switch (sp->req->handling) {
@@ -301,7 +301,7 @@ cnt_prepresp(struct sess *sp)
 		AZ(wrk->obj);
 		sp->req->restarts++;
 		sp->req->director = NULL;
-		http_Setup(wrk->resp, NULL);
+		http_Setup(sp->req->resp, NULL);
 		sp->step = STP_RECV;
 		return (0);
 	default:
@@ -349,7 +349,7 @@ cnt_deliver(struct sess *sp)
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
-	http_Setup(wrk->resp, NULL);
+	http_Setup(sp->req->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
 }
@@ -1012,7 +1012,7 @@ cnt_streambody(struct sess *sp)
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
-	http_Setup(wrk->resp, NULL);
+	http_Setup(sp->req->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
 }
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index a35c258..9c26eef 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -201,8 +201,6 @@ pan_wrk(const struct worker *wrk)
 		pan_http("bereq", wrk->busyobj->bereq, 4);
 	if (wrk->busyobj != NULL && wrk->busyobj->beresp->ws != NULL)
 		pan_http("beresp", wrk->busyobj->beresp, 4);
-	if (wrk->resp->ws != NULL)
-		pan_http("resp", wrk->resp, 4);
 	VSB_printf(pan_vsp, "  },\n");
 }
 
@@ -267,6 +265,8 @@ pan_sess(const struct sess *sp)
 
 	pan_ws(sp->req->ws, 2);
 	pan_http("req", sp->req->http, 2);
+	if (sp->req->resp->ws != NULL)
+		pan_http("resp", sp->req->resp, 4);
 
 	if (sp->wrk != NULL)
 		pan_wrk(sp->wrk);
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 8ab73fe..7b1471e 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -194,7 +194,6 @@ Pool_Work_Thread(void *priv, struct worker *w)
 		w->do_what = pool_do_inval;
 
 		CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-		CHECK_OBJ_NOTNULL(w->resp, HTTP_MAGIC);
 
 		WS_Reset(w->ws, NULL);
 
@@ -267,7 +266,6 @@ Pool_Work_Thread(void *priv, struct worker *w)
 
 			WS_Assert(w->ws);
 			AZ(w->busyobj);
-			AZ(w->resp->ws);
 			AZ(w->wrw.wfd);
 			AZ(w->storage_hint);
 			assert(w->wlp == w->wlb);
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 2398e5b..5356b7b 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -87,14 +87,14 @@ res_dorange(const struct sess *sp, const char *r, ssize_t *plow, ssize_t *phigh)
 	if (low > high)
 		return;
 
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 	    "Content-Range: bytes %jd-%jd/%jd",
 	    (intmax_t)low, (intmax_t)high, (intmax_t)sp->wrk->obj->len);
-	http_Unset(sp->wrk->resp, H_Content_Length);
+	http_Unset(sp->req->resp, H_Content_Length);
 	assert(sp->wrk->res_mode & RES_LEN);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 	    "Content-Length: %jd", (intmax_t)(1 + high - low));
-	http_SetResp(sp->wrk->resp, "HTTP/1.1", 206, "Partial Content");
+	http_SetResp(sp->req->resp, "HTTP/1.1", 206, "Partial Content");
 
 	*plow = low;
 	*phigh = high;
@@ -110,39 +110,39 @@ RES_BuildHttp(const struct sess *sp)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
 
-	http_ClrHeader(sp->wrk->resp);
-	sp->wrk->resp->logtag = HTTP_Tx;
-	http_CopyResp(sp->wrk->resp, sp->wrk->obj->http);
-	http_FilterFields(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	http_ClrHeader(sp->req->resp);
+	sp->req->resp->logtag = HTTP_Tx;
+	http_CopyResp(sp->req->resp, sp->wrk->obj->http);
+	http_FilterFields(sp->wrk, sp->vsl_id, sp->req->resp,
 	    sp->wrk->obj->http, HTTPH_A_DELIVER);
 
 	if (!(sp->wrk->res_mode & RES_LEN)) {
-		http_Unset(sp->wrk->resp, H_Content_Length);
+		http_Unset(sp->req->resp, H_Content_Length);
 	} else if (cache_param->http_range_support) {
 		/* We only accept ranges if we know the length */
-		http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+		http_SetHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "Accept-Ranges: bytes");
 	}
 
 	if (sp->wrk->res_mode & RES_CHUNKED)
-		http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+		http_SetHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "Transfer-Encoding: chunked");
 
 	VTIM_format(VTIM_real(), time_str);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 	    "Date: %s", time_str);
 
 	if (sp->req->xid != sp->wrk->obj->xid)
-		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "X-Varnish: %u %u", sp->req->xid, sp->wrk->obj->xid);
 	else
-		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "X-Varnish: %u", sp->req->xid);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Age: %.0f",
 	    sp->wrk->obj->exp.age + sp->req->t_resp -
 	    sp->wrk->obj->exp.entered);
-	http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
+	http_SetHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Via: 1.1 varnish");
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Connection: %s",
 	    sp->req->doclose ? "close" : "keep-alive");
 }
 
@@ -263,9 +263,9 @@ RES_WriteObj(struct sess *sp)
 	    sp->req->http->conds &&
 	    RFC2616_Do_Cond(sp)) {
 		sp->req->wantbody = 0;
-		http_SetResp(sp->wrk->resp, "HTTP/1.1", 304, "Not Modified");
-		http_Unset(sp->wrk->resp, H_Content_Length);
-		http_Unset(sp->wrk->resp, H_Transfer_Encoding);
+		http_SetResp(sp->req->resp, "HTTP/1.1", 304, "Not Modified");
+		http_Unset(sp->req->resp, H_Content_Length);
+		http_Unset(sp->req->resp, H_Transfer_Encoding);
 	}
 
 	/*
@@ -286,14 +286,14 @@ RES_WriteObj(struct sess *sp)
 	 * Always remove C-E if client don't grok it
 	 */
 	if (sp->wrk->res_mode & RES_GUNZIP)
-		http_Unset(sp->wrk->resp, H_Content_Encoding);
+		http_Unset(sp->req->resp, H_Content_Encoding);
 
 	/*
 	 * Send HTTP protocol header, unless interior ESI object
 	 */
 	if (!(sp->wrk->res_mode & RES_ESI_CHILD))
 		sp->wrk->acct_tmp.hdrbytes +=
-		    http_Write(sp->wrk, sp->vsl_id, sp->wrk->resp, 1);
+		    http_Write(sp->wrk, sp->vsl_id, sp->req->resp, 1);
 
 	if (!sp->req->wantbody)
 		sp->wrk->res_mode &= ~RES_CHUNKED;
@@ -344,15 +344,15 @@ RES_StreamStart(struct sess *sp)
 	 * Always remove C-E if client don't grok it
 	 */
 	if (sp->wrk->res_mode & RES_GUNZIP)
-		http_Unset(sp->wrk->resp, H_Content_Encoding);
+		http_Unset(sp->req->resp, H_Content_Encoding);
 
 	if (!(sp->wrk->res_mode & RES_CHUNKED) &&
 	    sp->wrk->busyobj->h_content_length != NULL)
-		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
+		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "Content-Length: %s", sp->wrk->busyobj->h_content_length);
 
 	sp->wrk->acct_tmp.hdrbytes +=
-	    http_Write(sp->wrk, sp->vsl_id, sp->wrk->resp, 1);
+	    http_Write(sp->wrk, sp->vsl_id, sp->req->resp, 1);
 
 	if (sp->wrk->res_mode & RES_CHUNKED)
 		WRW_Chunked(sp->wrk);
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 0091407..ee5060f 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -270,14 +270,18 @@ SES_GetReq(struct sess *sp)
 	nhttp = (uint16_t)cache_param->http_max_hdr;
 	hl = HTTP_estimate(nhttp);
 
-	xxxassert(sz > 2 * hl + 128);
+	xxxassert(sz > 3 * hl + 128);
 
 	sp->req->http = HTTP_create(p, nhttp);
-	p += hl;
+	p += hl;		// XXX: align ?
 	sz -= hl;
 
 	sp->req->http0 = HTTP_create(p, nhttp);
-	p += hl;
+	p += hl;		// XXX: align ?
+	sz -= hl;
+
+	sp->req->resp = HTTP_create(p, nhttp);
+	p += hl;		// XXX: align ?
 	sz -= hl;
 
 	WS_Init(sp->req->ws, "req", p, sz);
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 7f27e8b..da50c44 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -52,7 +52,7 @@ const void * const vrt_magic_string_end = &vrt_magic_string_end;
 /*--------------------------------------------------------------------*/
 
 void
-VRT_error(struct sess *sp, unsigned code, const char *reason)
+VRT_error(const struct sess *sp, unsigned code, const char *reason)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
@@ -106,7 +106,7 @@ vrt_selecthttp(const struct sess *sp, enum gethdr_e where)
 		hp = sp->wrk->busyobj->beresp;
 		break;
 	case HDR_RESP:
-		hp = sp->wrk->resp;
+		hp = sp->req->resp;
 		break;
 	case HDR_OBJ:
 		CHECK_OBJ_NOTNULL(sp->wrk->obj, OBJECT_MAGIC);
@@ -239,7 +239,7 @@ VRT_SetHdr(const struct sess *sp , enum gethdr_e where, const char *hdr,
 /*--------------------------------------------------------------------*/
 
 void
-VRT_handling(struct sess *sp, unsigned hand)
+VRT_handling(const struct sess *sp, unsigned hand)
 {
 
 	if (sp == NULL) {
@@ -368,7 +368,7 @@ VRT_bool_string(const struct sess *sp, unsigned val)
 /*--------------------------------------------------------------------*/
 
 void
-VRT_Rollback(struct sess *sp)
+VRT_Rollback(const struct sess *sp)
 {
 
 	HTTP_Copy(sp->req->http, sp->req->http0);
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index d128818..6e5c751 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -90,8 +90,8 @@ VRT_DO_HDR(bereq, url,		sp->wrk->busyobj->bereq,	HTTP_HDR_URL)
 VRT_DO_HDR(bereq, proto,	sp->wrk->busyobj->bereq,	HTTP_HDR_PROTO)
 VRT_DO_HDR(obj,   proto,	sp->wrk->obj->http,	HTTP_HDR_PROTO)
 VRT_DO_HDR(obj,   response,	sp->wrk->obj->http,	HTTP_HDR_RESPONSE)
-VRT_DO_HDR(resp,  proto,	sp->wrk->resp,		HTTP_HDR_PROTO)
-VRT_DO_HDR(resp,  response,	sp->wrk->resp,		HTTP_HDR_RESPONSE)
+VRT_DO_HDR(resp,  proto,	sp->req->resp,		HTTP_HDR_PROTO)
+VRT_DO_HDR(resp,  response,	sp->req->resp,		HTTP_HDR_RESPONSE)
 VRT_DO_HDR(beresp,  proto,	sp->wrk->busyobj->beresp,	HTTP_HDR_PROTO)
 VRT_DO_HDR(beresp,  response,	sp->wrk->busyobj->beresp, HTTP_HDR_RESPONSE)
 
@@ -116,7 +116,7 @@ VRT_r_##obj##_status(const struct sess *sp)			\
 
 VRT_DO_STATUS(obj, sp->wrk->obj->http)
 VRT_DO_STATUS(beresp, sp->wrk->busyobj->beresp)
-VRT_DO_STATUS(resp, sp->wrk->resp)
+VRT_DO_STATUS(resp, sp->req->resp)
 
 /*--------------------------------------------------------------------*/
 
@@ -205,8 +205,8 @@ VBERESP(beresp, unsigned, do_stream, busyobj->do_stream)
 
 /*--------------------------------------------------------------------*/
 
-const char * __match_proto__()
-VRT_r_client_identity(struct sess *sp)
+const char *
+VRT_r_client_identity(const struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	if (sp->req->client_identity != NULL)
@@ -216,7 +216,7 @@ VRT_r_client_identity(struct sess *sp)
 }
 
 void
-VRT_l_client_identity(struct sess *sp, const char *str, ...)
+VRT_l_client_identity(const struct sess *sp, const char *str, ...)
 {
 	va_list ap;
 	char *b;
@@ -304,14 +304,14 @@ VRT_l_beresp_storage(struct sess *sp, const char *str, ...)
 /*--------------------------------------------------------------------*/
 
 void
-VRT_l_req_backend(struct sess *sp, struct director *be)
+VRT_l_req_backend(const struct sess *sp, struct director *be)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	sp->req->director = be;
 }
 
-struct director * __match_proto__()
-VRT_r_req_backend(struct sess *sp)
+struct director *
+VRT_r_req_backend(const struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	return (sp->req->director);
@@ -320,7 +320,7 @@ VRT_r_req_backend(struct sess *sp)
 /*--------------------------------------------------------------------*/
 
 void
-VRT_l_req_esi(struct sess *sp, unsigned process_esi)
+VRT_l_req_esi(const struct sess *sp, unsigned process_esi)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	/*
@@ -331,8 +331,8 @@ VRT_l_req_esi(struct sess *sp, unsigned process_esi)
 		sp->req->disable_esi = !process_esi;
 }
 
-unsigned __match_proto__()
-VRT_r_req_esi(struct sess *sp)
+unsigned
+VRT_r_req_esi(const struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	return (!sp->req->disable_esi);
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 6b1d9dd..ce665bc 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -133,13 +133,12 @@ WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func, void *priv)
 
 static void *
 wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
-    uint16_t nhttp, unsigned http_space, unsigned siov)
+    unsigned siov)
 {
 	struct worker *w, ww;
 	uint32_t wlog[shm_workspace / 4];
 	/* XXX: can we trust these to be properly aligned ? */
 	unsigned char ws[sess_workspace];
-	unsigned char http2[http_space];
 	struct iovec iov[siov];
 	struct SHA256Context sha256;
 
@@ -151,7 +150,6 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	w->wlb = w->wlp = wlog;
 	w->wle = wlog + (sizeof wlog) / 4;
 	w->sha256ctx = &sha256;
-	w->resp = HTTP_create(http2, nhttp);
 	w->wrw.iov = iov;
 	w->wrw.siov = siov;
 	w->wrw.ciov = siov;
@@ -187,8 +185,7 @@ WRK_thread(void *priv)
 		siov = IOV_MAX;
 	return (wrk_thread_real(priv,
 	    cache_param->shm_workspace,
-	    cache_param->wthread_workspace,
-	    nhttp, HTTP_estimate(nhttp), siov));
+	    cache_param->wthread_workspace, siov));
 }
 
 void
diff --git a/bin/varnishtest/tests.disabled/r00693.vtc b/bin/varnishtest/tests.disabled/r00693.vtc
new file mode 100644
index 0000000..ff99ca7
--- /dev/null
+++ b/bin/varnishtest/tests.disabled/r00693.vtc
@@ -0,0 +1,65 @@
+varnishtest "check boundary condition on vrt_assemble_string()"
+
+feature 64bit
+
+server s1 {
+	rxreq
+	expect req.http.baz == <undef>
+	txresp -status 201
+
+	rxreq
+	expect req.http.baz == <undef>
+	txresp -status 202
+
+	rxreq
+	expect req.http.baz == "BAZ"
+	txresp -status 203
+
+} -start
+
+varnish v1 -arg "-p workspace_client=3072" -vcl+backend {
+
+	sub vcl_recv {
+		set req.http.foo = 
+			req.http.bar +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcdef" + "0123456789abcdef" +
+			"0123456789abcde";
+		set req.http.baz = "BAZ";
+		return (pass);
+	}
+	sub vcl_hash {
+		hash_data(req.url);
+		return (hash);
+	}
+} -start
+
+client c1 {
+	# This should soak up all bytes but the last in the workspace
+	txreq -hdr "foo: x" -hdr "bar: A" 
+	rxresp
+	expect resp.status == 201
+
+	# This should soak up all bytes in the workspace
+	txreq -hdr "foo: x" -hdr "bar: AB" 
+	rxresp
+	expect resp.status == 202
+
+	# This overcommits the workspace, failing the "bar" set,
+	# Thus allowing the "baz" set to work.
+	txreq -hdr "foo: x" -hdr "bar: ABC" 
+	rxresp
+	expect resp.status == 203
+
+} -run
diff --git a/bin/varnishtest/tests/r00693.vtc b/bin/varnishtest/tests/r00693.vtc
deleted file mode 100644
index ff99ca7..0000000
--- a/bin/varnishtest/tests/r00693.vtc
+++ /dev/null
@@ -1,65 +0,0 @@
-varnishtest "check boundary condition on vrt_assemble_string()"
-
-feature 64bit
-
-server s1 {
-	rxreq
-	expect req.http.baz == <undef>
-	txresp -status 201
-
-	rxreq
-	expect req.http.baz == <undef>
-	txresp -status 202
-
-	rxreq
-	expect req.http.baz == "BAZ"
-	txresp -status 203
-
-} -start
-
-varnish v1 -arg "-p workspace_client=3072" -vcl+backend {
-
-	sub vcl_recv {
-		set req.http.foo = 
-			req.http.bar +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcdef" + "0123456789abcdef" +
-			"0123456789abcde";
-		set req.http.baz = "BAZ";
-		return (pass);
-	}
-	sub vcl_hash {
-		hash_data(req.url);
-		return (hash);
-	}
-} -start
-
-client c1 {
-	# This should soak up all bytes but the last in the workspace
-	txreq -hdr "foo: x" -hdr "bar: A" 
-	rxresp
-	expect resp.status == 201
-
-	# This should soak up all bytes in the workspace
-	txreq -hdr "foo: x" -hdr "bar: AB" 
-	rxresp
-	expect resp.status == 202
-
-	# This overcommits the workspace, failing the "bar" set,
-	# Thus allowing the "baz" set to work.
-	txreq -hdr "foo: x" -hdr "bar: ABC" 
-	rxresp
-	expect resp.status == 203
-
-} -run
diff --git a/include/vrt.h b/include/vrt.h
index 72c4cfe..bbf16ac 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -156,14 +156,14 @@ void VRT_purge(const struct sess *sp, double ttl, double grace);
 
 void VRT_count(const struct sess *, unsigned);
 int VRT_rewrite(const char *, const char *);
-void VRT_error(struct sess *, unsigned, const char *);
+void VRT_error(const struct sess *, unsigned, const char *);
 int VRT_switch_config(const char *);
 
 enum gethdr_e { HDR_REQ, HDR_RESP, HDR_OBJ, HDR_BEREQ, HDR_BERESP };
 char *VRT_GetHdr(const struct sess *, enum gethdr_e where, const char *);
 void VRT_SetHdr(const struct sess *, enum gethdr_e where, const char *,
     const char *, ...);
-void VRT_handling(struct sess *sp, unsigned hand);
+void VRT_handling(const struct sess *sp, unsigned hand);
 
 void VRT_hashdata(const struct sess *sp, const char *str, ...);
 
@@ -172,7 +172,7 @@ int VRT_strcmp(const char *s1, const char *s2);
 void VRT_memmove(void *dst, const void *src, unsigned len);
 
 void VRT_ESI(const struct sess *sp);
-void VRT_Rollback(struct sess *sp);
+void VRT_Rollback(const struct sess *sp);
 
 /* Synthetic pages */
 void VRT_synth_page(const struct sess *sp, unsigned flags, const char *, ...);
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index dde0e89..b91f675 100755
--- a/lib/libvcl/generate.py
+++ b/lib/libvcl/generate.py
@@ -113,7 +113,7 @@ sp_variables = (
 		'STRING',
 		( 'proc',),
 		( 'proc',),
-		'struct sess *'
+		'const struct sess *'
 	),
 	('server.ip',
 		'IP',
@@ -167,7 +167,7 @@ sp_variables = (
 		'BACKEND',
 		( 'proc',),
 		( 'proc',),
-		'struct sess *'
+		'const struct sess *'
 	),
 	('req.restarts',
 		'INT',
@@ -209,7 +209,7 @@ sp_variables = (
 		'BOOL',
 		( 'recv', 'fetch', 'deliver', 'error',),
 		( 'recv', 'fetch', 'deliver', 'error',),
-		'struct sess *'
+		'const struct sess *'
 	),
 	('req.can_gzip',
 		'BOOL',



From phk at varnish-cache.org  Sun Dec 25 14:36:50 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Sun, 25 Dec 2011 15:36:50 +0100
Subject: [master] 2955f0b Wrap a line
Message-ID: <E1RepBy-0007ss-JC@project.varnish-software.com>

commit 2955f0ba479c4e1b036c2a7b77c7381169f6b348
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Dec 25 14:36:42 2011 +0000

    Wrap a line

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index da50c44..67875bd 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -61,7 +61,8 @@ VRT_error(const struct sess *sp, unsigned code, const char *reason)
 	if (code < 100 || code > 999)
 		code = 503;
 	sp->req->err_code = (uint16_t)code;
-	sp->req->err_reason = reason ? reason : http_StatusMessage(sp->req->err_code);
+	sp->req->err_reason =
+	    reason ? reason : http_StatusMessage(sp->req->err_code);
 }
 
 /*--------------------------------------------------------------------*/



From phk at varnish-cache.org  Mon Dec 26 09:05:28 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 10:05:28 +0100
Subject: [master] 41608b6 Always call struct worker variables "wrk" to ease
	grep'ing
Message-ID: <E1Rf6Uq-0002k2-B7@project.varnish-software.com>

commit 41608b69413078adb0d22db0c664665e3843c6df
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 09:04:54 2011 +0000

    Always call struct worker variables "wrk" to ease grep'ing

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index da35db4..d55545b 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -220,15 +220,15 @@ VCA_Accept(struct listen_sock *ls, struct wrk_accept *wa)
  */
 
 void
-VCA_FailSess(struct worker *w)
+VCA_FailSess(struct worker *wrk)
 {
 	struct wrk_accept *wa;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CAST_OBJ_NOTNULL(wa, (void*)w->ws->f, WRK_ACCEPT_MAGIC);
-	AZ(w->sp);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CAST_OBJ_NOTNULL(wa, (void*)wrk->ws->f, WRK_ACCEPT_MAGIC);
+	AZ(wrk->sp);
 	AZ(close(wa->acceptsock));
-	w->stats.sess_drop++;
+	wrk->stats.sess_drop++;
 	vca_pace_bad();
 }
 
@@ -237,14 +237,14 @@ VCA_FailSess(struct worker *w)
  */
 
 void
-VCA_SetupSess(struct worker *w)
+VCA_SetupSess(struct worker *wrk)
 {
 	struct sess *sp;
 	struct wrk_accept *wa;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CAST_OBJ_NOTNULL(wa, (void*)w->ws->f, WRK_ACCEPT_MAGIC);
-	sp = w->sp;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CAST_OBJ_NOTNULL(wa, (void*)wrk->ws->f, WRK_ACCEPT_MAGIC);
+	sp = wrk->sp;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	sp->fd = wa->acceptsock;
 	sp->vsl_id = wa->acceptsock | VSL_CLIENTMARKER ;
@@ -258,7 +258,7 @@ VCA_SetupSess(struct worker *w)
 	memcpy(&sp->sockaddr, &wa->acceptaddr, wa->acceptaddrlen);
 	sp->sockaddrlen = wa->acceptaddrlen;
 	vca_pace_good();
-	w->stats.sess_conn++;
+	wrk->stats.sess_conn++;
 
 	if (need_test)
 		sock_test(sp->fd);
diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index abb9e43..2432691 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -127,6 +127,7 @@ cli_debug_sizeof(struct cli *cli, const char * const *av, void *priv)
 	SZOF(struct http_conn);
 	SZOF(struct acct);
 	SZOF(struct worker);
+	SZOF(struct wrk_accept);
 	SZOF(struct storage);
 	SZOF(struct object);
 	SZOF(struct objcore);
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 7b1471e..2236f0b 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -129,20 +129,20 @@ static pthread_t		thr_pool_herder;
  */
 
 static int
-pool_accept(struct pool *pp, struct worker *w, const struct poolsock *ps)
+pool_accept(struct pool *pp, struct worker *wrk, const struct poolsock *ps)
 {
-	struct worker *w2;
+	struct worker *wrk2;
 	struct wrk_accept *wa, *wa2;
 
 	CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(ps, POOLSOCK_MAGIC);
 
 	CHECK_OBJ_NOTNULL(ps->lsock, LISTEN_SOCK_MAGIC);
 	Lck_AssertHeld(&pp->mtx);
 	Lck_Unlock(&pp->mtx);
-	assert(sizeof *wa == WS_Reserve(w->ws, sizeof *wa));
-	wa = (void*)w->ws->f;
+	assert(sizeof *wa == WS_Reserve(wrk->ws, sizeof *wa));
+	wa = (void*)wrk->ws->f;
 	while (1) {
 		memset(wa, 0, sizeof *wa);
 		wa->magic = WRK_ACCEPT_MAGIC;
@@ -153,23 +153,23 @@ pool_accept(struct pool *pp, struct worker *w, const struct poolsock *ps)
 			return (-1);
 		}
 		if (VCA_Accept(ps->lsock, wa) < 0) {
-			w->stats.sess_fail++;
+			wrk->stats.sess_fail++;
 			/* We're going to pace in vca anyway... */
-			(void)WRK_TrySumStat(w);
+			(void)WRK_TrySumStat(wrk);
 			continue;
 		}
 
 		Lck_Lock(&pp->mtx);
 		if (VTAILQ_EMPTY(&pp->idle))
 			return (0);
-		w2 = VTAILQ_FIRST(&pp->idle);
-		VTAILQ_REMOVE(&pp->idle, w2, list);
+		wrk2 = VTAILQ_FIRST(&pp->idle);
+		VTAILQ_REMOVE(&pp->idle, wrk2, list);
 		Lck_Unlock(&pp->mtx);
-		assert(sizeof *wa2 == WS_Reserve(w2->ws, sizeof *wa2));
-		wa2 = (void*)w2->ws->f;
+		assert(sizeof *wa2 == WS_Reserve(wrk2->ws, sizeof *wa2));
+		wa2 = (void*)wrk2->ws->f;
 		memcpy(wa2, wa, sizeof *wa);
-		w2->do_what = pool_do_accept;
-		AZ(pthread_cond_signal(&w2->cond));
+		wrk2->do_what = pool_do_accept;
+		AZ(pthread_cond_signal(&wrk2->cond));
 	}
 }
 
@@ -178,111 +178,111 @@ pool_accept(struct pool *pp, struct worker *w, const struct poolsock *ps)
  */
 
 void
-Pool_Work_Thread(void *priv, struct worker *w)
+Pool_Work_Thread(void *priv, struct worker *wrk)
 {
 	struct pool *pp;
 	int stats_clean, i;
 	struct poolsock *ps;
 
 	CAST_OBJ_NOTNULL(pp, priv, POOL_MAGIC);
-	w->pool = pp;
+	wrk->pool = pp;
 	Lck_Lock(&pp->mtx);
 	stats_clean = 1;
 	while (1) {
 
 		Lck_AssertHeld(&pp->mtx);
-		w->do_what = pool_do_inval;
+		wrk->do_what = pool_do_inval;
 
-		CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+		CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-		WS_Reset(w->ws, NULL);
+		WS_Reset(wrk->ws, NULL);
 
-		w->sp = VTAILQ_FIRST(&pp->queue);
-		if (w->sp != NULL) {
+		wrk->sp = VTAILQ_FIRST(&pp->queue);
+		if (wrk->sp != NULL) {
 			/* Process queued requests, if any */
 			assert(pp->lqueue > 0);
-			VTAILQ_REMOVE(&pp->queue, w->sp, poollist);
-			w->do_what = pool_do_sess;
+			VTAILQ_REMOVE(&pp->queue, wrk->sp, poollist);
+			wrk->do_what = pool_do_sess;
 			pp->lqueue--;
 		} else if (!VTAILQ_EMPTY(&pp->socks)) {
 			/* Accept on a socket */
 			ps = VTAILQ_FIRST(&pp->socks);
 			VTAILQ_REMOVE(&pp->socks, ps, list);
-			i = pool_accept(pp, w, ps);
+			i = pool_accept(pp, wrk, ps);
 			Lck_AssertHeld(&pp->mtx);
 			if (i < 0) {
 				/* Socket Shutdown */
 				FREE_OBJ(ps);
-				WS_Release(w->ws, 0);
+				WS_Release(wrk->ws, 0);
 				continue;
 			}
 			VTAILQ_INSERT_TAIL(&pp->socks, ps, list);
-			w->do_what = pool_do_accept;
+			wrk->do_what = pool_do_accept;
 		} else if (VTAILQ_EMPTY(&pp->socks)) {
 			/* Nothing to do: To sleep, perchance to dream ... */
-			if (isnan(w->lastused))
-				w->lastused = VTIM_real();
-			VTAILQ_INSERT_HEAD(&pp->idle, w, list);
+			if (isnan(wrk->lastused))
+				wrk->lastused = VTIM_real();
+			VTAILQ_INSERT_HEAD(&pp->idle, wrk, list);
 			if (!stats_clean)
-				WRK_SumStat(w);
-			(void)Lck_CondWait(&w->cond, &pp->mtx, NULL);
+				WRK_SumStat(wrk);
+			(void)Lck_CondWait(&wrk->cond, &pp->mtx, NULL);
 		}
 
-		if (w->do_what == pool_do_die)
+		if (wrk->do_what == pool_do_die)
 			break;
 
 		Lck_Unlock(&pp->mtx);
 
-		if (w->do_what == pool_do_accept) {
+		if (wrk->do_what == pool_do_accept) {
 			/* Turn accepted socket into a session */
-			AZ(w->sp);
-			AN(w->ws->r);
-			w->sp = SES_New(pp->sesspool);
-			if (w->sp == NULL) {
-				VCA_FailSess(w);
-				w->do_what = pool_do_nothing;
+			AZ(wrk->sp);
+			AN(wrk->ws->r);
+			wrk->sp = SES_New(pp->sesspool);
+			if (wrk->sp == NULL) {
+				VCA_FailSess(wrk);
+				wrk->do_what = pool_do_nothing;
 			} else {
-				VCA_SetupSess(w);
-				w->sp->step = STP_FIRST;
-				w->do_what = pool_do_sess;
+				VCA_SetupSess(wrk);
+				wrk->sp->step = STP_FIRST;
+				wrk->do_what = pool_do_sess;
 			}
-			WS_Release(w->ws, 0);
+			WS_Release(wrk->ws, 0);
 		}
 
-		if (w->do_what == pool_do_sess) {
-			CHECK_OBJ_NOTNULL(w->sp, SESS_MAGIC);
-			AZ(w->ws->r);
+		if (wrk->do_what == pool_do_sess) {
+			CHECK_OBJ_NOTNULL(wrk->sp, SESS_MAGIC);
+			AZ(wrk->ws->r);
 
 			stats_clean = 0;
-			w->lastused = NAN;
-			w->storage_hint = NULL;
+			wrk->lastused = NAN;
+			wrk->storage_hint = NULL;
 
-			AZ(w->sp->wrk);
-			THR_SetSession(w->sp);
-			w->sp->wrk = w;
-			CNT_Session(w->sp);
+			AZ(wrk->sp->wrk);
+			THR_SetSession(wrk->sp);
+			wrk->sp->wrk = wrk;
+			CNT_Session(wrk->sp);
 			THR_SetSession(NULL);
-			w->sp = NULL;
+			wrk->sp = NULL;
 
-			WS_Assert(w->ws);
-			AZ(w->busyobj);
-			AZ(w->wrw.wfd);
-			AZ(w->storage_hint);
-			assert(w->wlp == w->wlb);
+			WS_Assert(wrk->ws);
+			AZ(wrk->busyobj);
+			AZ(wrk->wrw.wfd);
+			AZ(wrk->storage_hint);
+			assert(wrk->wlp == wrk->wlb);
 			if (cache_param->diag_bitmap & 0x00040000) {
-				if (w->vcl != NULL)
-					VCL_Rel(&w->vcl);
+				if (wrk->vcl != NULL)
+					VCL_Rel(&wrk->vcl);
 			}
-		} else if (w->do_what == pool_do_nothing) {
+		} else if (wrk->do_what == pool_do_nothing) {
 			/* we already did */
 		} else {
-			WRONG("Invalid w->do_what");
+			WRONG("Invalid wrk->do_what");
 		}
-		stats_clean = WRK_TrySumStat(w);
+		stats_clean = WRK_TrySumStat(wrk);
 		Lck_Lock(&pp->mtx);
 	}
 	Lck_Unlock(&pp->mtx);
-	w->pool = NULL;
+	wrk->pool = NULL;
 }
 
 /*--------------------------------------------------------------------
@@ -294,18 +294,18 @@ Pool_Work_Thread(void *priv, struct worker *w)
 static int
 pool_queue(struct pool *pp, struct sess *sp)
 {
-	struct worker *w;
+	struct worker *wrk;
 
 	Lck_Lock(&pp->mtx);
 
 	/* If there are idle threads, we tickle the first one into action */
-	w = VTAILQ_FIRST(&pp->idle);
-	if (w != NULL) {
-		VTAILQ_REMOVE(&pp->idle, w, list);
+	wrk = VTAILQ_FIRST(&pp->idle);
+	if (wrk != NULL) {
+		VTAILQ_REMOVE(&pp->idle, wrk, list);
 		Lck_Unlock(&pp->mtx);
-		w->sp = sp;
-		w->do_what = pool_do_sess;
-		AZ(pthread_cond_signal(&w->cond));
+		wrk->sp = sp;
+		wrk->do_what = pool_do_sess;
+		AZ(pthread_cond_signal(&wrk->cond));
 		return (0);
 	}
 
@@ -397,7 +397,7 @@ pool_herder(void *priv)
 	pthread_attr_t tp_attr;
 	struct timespec ts;
 	double t_idle;
-	struct worker *w;
+	struct worker *wrk;
 	int i;
 
 	CAST_OBJ_NOTNULL(pp, priv, POOL_MAGIC);
@@ -442,25 +442,25 @@ pool_herder(void *priv)
 		VSC_C_main->sess_queued += pp->nqueued;
 		VSC_C_main->sess_dropped += pp->ndropped;
 		pp->nqueued = pp->ndropped = 0;
-		w = VTAILQ_LAST(&pp->idle, workerhead);
-		if (w != NULL &&
-		    (w->lastused < t_idle ||
+		wrk = VTAILQ_LAST(&pp->idle, workerhead);
+		if (wrk != NULL &&
+		    (wrk->lastused < t_idle ||
 		    pp->nthr > cache_param->wthread_max)) {
-			VTAILQ_REMOVE(&pp->idle, w, list);
+			VTAILQ_REMOVE(&pp->idle, wrk, list);
 		} else
-			w = NULL;
+			wrk = NULL;
 		Lck_Unlock(&pp->mtx);
 
 		/* And give it a kiss on the cheek... */
-		if (w != NULL) {
+		if (wrk != NULL) {
 			pp->nthr--;
 			Lck_Lock(&pool_mtx);
 			VSC_C_main->threads--;
 			VSC_C_main->threads_destroyed++;
 			Lck_Unlock(&pool_mtx);
-			AZ(w->sp);
-			w->do_what = pool_do_die;
-			AZ(pthread_cond_signal(&w->cond));
+			AZ(wrk->sp);
+			wrk->do_what = pool_do_die;
+			AZ(pthread_cond_signal(&wrk->cond));
 		}
 	}
 	NEEDLESS_RETURN(NULL);
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 5356b7b..5c10c35 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -359,52 +359,52 @@ RES_StreamStart(struct sess *sp)
 }
 
 void
-RES_StreamPoll(struct worker *w)
+RES_StreamPoll(struct worker *wrk)
 {
 	struct stream_ctx *sctx;
 	struct storage *st;
 	ssize_t l, l2;
 	void *ptr;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj->fetch_obj, OBJECT_MAGIC);
-	sctx = w->sctx;
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj->fetch_obj, OBJECT_MAGIC);
+	sctx = wrk->sctx;
 	CHECK_OBJ_NOTNULL(sctx, STREAM_CTX_MAGIC);
-	if (w->busyobj->fetch_obj->len == sctx->stream_next)
+	if (wrk->busyobj->fetch_obj->len == sctx->stream_next)
 		return;
-	assert(w->busyobj->fetch_obj->len > sctx->stream_next);
+	assert(wrk->busyobj->fetch_obj->len > sctx->stream_next);
 	l = sctx->stream_front;
-	VTAILQ_FOREACH(st, &w->busyobj->fetch_obj->store, list) {
+	VTAILQ_FOREACH(st, &wrk->busyobj->fetch_obj->store, list) {
 		if (st->len + l <= sctx->stream_next) {
 			l += st->len;
 			continue;
 		}
 		l2 = st->len + l - sctx->stream_next;
 		ptr = st->ptr + (sctx->stream_next - l);
-		if (w->res_mode & RES_GUNZIP) {
-			(void)VGZ_WrwGunzip(w, sctx->vgz, ptr, l2,
+		if (wrk->res_mode & RES_GUNZIP) {
+			(void)VGZ_WrwGunzip(wrk, sctx->vgz, ptr, l2,
 			    sctx->obuf, sctx->obuf_len, &sctx->obuf_ptr);
 		} else {
-			(void)WRW_Write(w, ptr, l2);
+			(void)WRW_Write(wrk, ptr, l2);
 		}
 		l += st->len;
 		sctx->stream_next += l2;
 	}
-	if (!(w->res_mode & RES_GUNZIP))
-		(void)WRW_Flush(w);
+	if (!(wrk->res_mode & RES_GUNZIP))
+		(void)WRW_Flush(wrk);
 
-	if (w->busyobj->fetch_obj->objcore == NULL ||
-	    (w->busyobj->fetch_obj->objcore->flags & OC_F_PASS)) {
+	if (wrk->busyobj->fetch_obj->objcore == NULL ||
+	    (wrk->busyobj->fetch_obj->objcore->flags & OC_F_PASS)) {
 		/*
 		 * This is a pass object, release storage as soon as we
 		 * have delivered it.
 		 */
 		while (1) {
-			st = VTAILQ_FIRST(&w->busyobj->fetch_obj->store);
+			st = VTAILQ_FIRST(&wrk->busyobj->fetch_obj->store);
 			if (st == NULL ||
 			    sctx->stream_front + st->len > sctx->stream_next)
 				break;
-			VTAILQ_REMOVE(&w->busyobj->fetch_obj->store, st, list);
+			VTAILQ_REMOVE(&wrk->busyobj->fetch_obj->store, st, list);
 			sctx->stream_front += st->len;
 			STV_free(st);
 		}
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index b7c43a1..c29f5a1 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -35,7 +35,7 @@
 #include "cache.h"
 #include "common/heritage.h"
 
-#include "cache_backend.h"	// For w->vbc
+#include "cache_backend.h"	// For wrk->vbc
 
 #include "vmb.h"
 #include "vtim.h"
@@ -180,30 +180,30 @@ VSL(enum VSL_tag_e tag, int id, const char *fmt, ...)
 /*--------------------------------------------------------------------*/
 
 void
-WSL_Flush(struct worker *w, int overflow)
+WSL_Flush(struct worker *wrk, int overflow)
 {
 	uint32_t *p;
 	unsigned l;
 
-	l = pdiff(w->wlb, w->wlp);
+	l = pdiff(wrk->wlb, wrk->wlp);
 	if (l == 0)
 		return;
 
 	assert(l >= 8);
 
-	p = vsl_get(l - 8, w->wlr, overflow);
+	p = vsl_get(l - 8, wrk->wlr, overflow);
 
-	memcpy(p + 1, w->wlb + 1, l - 4);
+	memcpy(p + 1, wrk->wlb + 1, l - 4);
 	VWMB();
-	p[0] = w->wlb[0];
-	w->wlp = w->wlb;
-	w->wlr = 0;
+	p[0] = wrk->wlb[0];
+	wrk->wlp = wrk->wlb;
+	wrk->wlr = 0;
 }
 
 /*--------------------------------------------------------------------*/
 
 void
-WSLR(struct worker *w, enum VSL_tag_e tag, int id, txt t)
+WSLR(struct worker *wrk, enum VSL_tag_e tag, int id, txt t)
 {
 	unsigned l, mlen;
 
@@ -217,25 +217,25 @@ WSLR(struct worker *w, enum VSL_tag_e tag, int id, txt t)
 		t.e = t.b + l;
 	}
 
-	assert(w->wlp < w->wle);
+	assert(wrk->wlp < wrk->wle);
 
 	/* Wrap if necessary */
-	if (VSL_END(w->wlp, l) >= w->wle)
-		WSL_Flush(w, 1);
-	assert (VSL_END(w->wlp, l) < w->wle);
-	memcpy(VSL_DATA(w->wlp), t.b, l);
-	vsl_hdr(tag, w->wlp, l, id);
-	w->wlp = VSL_END(w->wlp, l);
-	assert(w->wlp < w->wle);
-	w->wlr++;
+	if (VSL_END(wrk->wlp, l) >= wrk->wle)
+		WSL_Flush(wrk, 1);
+	assert (VSL_END(wrk->wlp, l) < wrk->wle);
+	memcpy(VSL_DATA(wrk->wlp), t.b, l);
+	vsl_hdr(tag, wrk->wlp, l, id);
+	wrk->wlp = VSL_END(wrk->wlp, l);
+	assert(wrk->wlp < wrk->wle);
+	wrk->wlr++;
 	if (cache_param->diag_bitmap & 0x10000)
-		WSL_Flush(w, 0);
+		WSL_Flush(wrk, 0);
 }
 
 /*--------------------------------------------------------------------*/
 
 static void
-wsl(struct worker *w, enum VSL_tag_e tag, int id, const char *fmt, va_list ap)
+wsl(struct worker *wrk, enum VSL_tag_e tag, int id, const char *fmt, va_list ap)
 {
 	char *p;
 	unsigned n, mlen;
@@ -247,38 +247,38 @@ wsl(struct worker *w, enum VSL_tag_e tag, int id, const char *fmt, va_list ap)
 	if (strchr(fmt, '%') == NULL) {
 		t.b = TRUST_ME(fmt);
 		t.e = strchr(t.b, '\0');
-		WSLR(w, tag, id, t);
+		WSLR(wrk, tag, id, t);
 	} else {
-		assert(w->wlp < w->wle);
+		assert(wrk->wlp < wrk->wle);
 
 		/* Wrap if we cannot fit a full size record */
-		if (VSL_END(w->wlp, mlen) >= w->wle)
-			WSL_Flush(w, 1);
+		if (VSL_END(wrk->wlp, mlen) >= wrk->wle)
+			WSL_Flush(wrk, 1);
 
-		p = VSL_DATA(w->wlp);
+		p = VSL_DATA(wrk->wlp);
 		n = vsnprintf(p, mlen, fmt, ap);
 		if (n > mlen)
 			n = mlen;	/* we truncate long fields */
-		vsl_hdr(tag, w->wlp, n, id);
-		w->wlp = VSL_END(w->wlp, n);
-		assert(w->wlp < w->wle);
-		w->wlr++;
+		vsl_hdr(tag, wrk->wlp, n, id);
+		wrk->wlp = VSL_END(wrk->wlp, n);
+		assert(wrk->wlp < wrk->wle);
+		wrk->wlr++;
 	}
 	if (cache_param->diag_bitmap & 0x10000)
-		WSL_Flush(w, 0);
+		WSL_Flush(wrk, 0);
 }
 
 /*--------------------------------------------------------------------*/
 
 void
-WSL(struct worker *w, enum VSL_tag_e tag, int id, const char *fmt, ...)
+WSL(struct worker *wrk, enum VSL_tag_e tag, int id, const char *fmt, ...)
 {
 	va_list ap;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	AN(fmt);
 	va_start(ap, fmt);
-	wsl(w, tag, id, fmt, ap);
+	wsl(wrk, tag, id, fmt, ap);
 	va_end(ap);
 }
 
@@ -286,16 +286,16 @@ WSL(struct worker *w, enum VSL_tag_e tag, int id, const char *fmt, ...)
 /*--------------------------------------------------------------------*/
 
 void
-WSLB(struct worker *w, enum VSL_tag_e tag, const char *fmt, ...)
+WSLB(struct worker *wrk, enum VSL_tag_e tag, const char *fmt, ...)
 {
 	va_list ap;
 
-	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj, BUSYOBJ_MAGIC);
-	CHECK_OBJ_NOTNULL(w->busyobj->vbc, VBC_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk->busyobj->vbc, VBC_MAGIC);
 	AN(fmt);
 	va_start(ap, fmt);
-	wsl(w, tag, w->busyobj->vbc->vsl_id, fmt, ap);
+	wsl(wrk, tag, wrk->busyobj->vbc->vsl_id, fmt, ap);
 	va_end(ap);
 }
 
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index ce665bc..2e933c5 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -94,7 +94,7 @@ static void *
 wrk_bgthread(void *arg)
 {
 	struct bgthread *bt;
-	struct worker ww;
+	struct worker wrk;
 	struct sess *sp;
 	uint32_t logbuf[1024];	/* XXX:  size ? */
 
@@ -102,11 +102,11 @@ wrk_bgthread(void *arg)
 	THR_SetName(bt->name);
 	sp = SES_Alloc();
 	XXXAN(sp);
-	memset(&ww, 0, sizeof ww);
-	sp->wrk = &ww;
-	ww.magic = WORKER_MAGIC;
-	ww.wlp = ww.wlb = logbuf;
-	ww.wle = logbuf + (sizeof logbuf) / 4;
+	memset(&wrk, 0, sizeof wrk);
+	sp->wrk = &wrk;
+	wrk.magic = WORKER_MAGIC;
+	wrk.wlp = wrk.wlb = logbuf;
+	wrk.wle = logbuf + (sizeof logbuf) / 4;
 
 	(void)bt->func(sp, bt->priv);
 
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 9935fc2..3b55490 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -348,11 +348,11 @@ static void *
 hcb_cleaner(void *priv)
 {
 	struct hcb_y *y, *y2;
-	struct worker ww;
+	struct worker wrk;
 	struct objhead *oh, *oh2;
 
-	memset(&ww, 0, sizeof ww);
-	ww.magic = WORKER_MAGIC;
+	memset(&wrk, 0, sizeof wrk);
+	wrk.magic = WORKER_MAGIC;
 
 	THR_SetName("hcb_cleaner");
 	(void)priv;
@@ -363,13 +363,13 @@ hcb_cleaner(void *priv)
 		}
 		VTAILQ_FOREACH_SAFE(oh, &dead_h, hoh_list, oh2) {
 			VTAILQ_REMOVE(&dead_h, oh, hoh_list);
-			HSH_DeleteObjHead(&ww, oh);
+			HSH_DeleteObjHead(&wrk, oh);
 		}
 		Lck_Lock(&hcb_mtx);
 		VSTAILQ_CONCAT(&dead_y, &cool_y);
 		VTAILQ_CONCAT(&dead_h, &cool_h, hoh_list);
 		Lck_Unlock(&hcb_mtx);
-		WRK_SumStat(&ww);
+		WRK_SumStat(&wrk);
 		VTIM_sleep(cache_param->critbit_cooloff);
 	}
 	NEEDLESS_RETURN(NULL);
@@ -386,6 +386,7 @@ hcb_start(void)
 	(void)oh;
 	CLI_AddFuncs(hcb_cmds);
 	Lck_New(&hcb_mtx, lck_hcb);
+	/* XXX: use WRK_BgThread */
 	AZ(pthread_create(&tp, NULL, hcb_cleaner, NULL));
 	memset(&hcb_root, 0, sizeof hcb_root);
 	hcb_build_bittbl();



From phk at varnish-cache.org  Mon Dec 26 09:12:18 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 10:12:18 +0100
Subject: [master] 110b8e7 Use WRK_BgThread() instead of hand-rolling
Message-ID: <E1Rf6bS-00031a-M3@project.varnish-software.com>

commit 110b8e719bdf062b449faf4b79dd360d4fba82c2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 09:12:08 2011 +0000

    Use WRK_BgThread() instead of hand-rolling

diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 3b55490..5fafac5 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -344,17 +344,13 @@ static struct cli_proto hcb_cmds[] = {
 
 /*--------------------------------------------------------------------*/
 
-static void *
-hcb_cleaner(void *priv)
+static void * __match_proto__(bgthread_t)
+hcb_cleaner(struct sess *sp, void *priv)
 {
 	struct hcb_y *y, *y2;
-	struct worker wrk;
+	struct worker *wrk = sp->wrk;
 	struct objhead *oh, *oh2;
 
-	memset(&wrk, 0, sizeof wrk);
-	wrk.magic = WORKER_MAGIC;
-
-	THR_SetName("hcb_cleaner");
 	(void)priv;
 	while (1) {
 		VSTAILQ_FOREACH_SAFE(y, &dead_y, list, y2) {
@@ -363,13 +359,13 @@ hcb_cleaner(void *priv)
 		}
 		VTAILQ_FOREACH_SAFE(oh, &dead_h, hoh_list, oh2) {
 			VTAILQ_REMOVE(&dead_h, oh, hoh_list);
-			HSH_DeleteObjHead(&wrk, oh);
+			HSH_DeleteObjHead(wrk, oh);
 		}
 		Lck_Lock(&hcb_mtx);
 		VSTAILQ_CONCAT(&dead_y, &cool_y);
 		VTAILQ_CONCAT(&dead_h, &cool_h, hoh_list);
 		Lck_Unlock(&hcb_mtx);
-		WRK_SumStat(&wrk);
+		WRK_SumStat(wrk);
 		VTIM_sleep(cache_param->critbit_cooloff);
 	}
 	NEEDLESS_RETURN(NULL);
@@ -386,8 +382,7 @@ hcb_start(void)
 	(void)oh;
 	CLI_AddFuncs(hcb_cmds);
 	Lck_New(&hcb_mtx, lck_hcb);
-	/* XXX: use WRK_BgThread */
-	AZ(pthread_create(&tp, NULL, hcb_cleaner, NULL));
+	WRK_BgThread(&tp, "hcb-cleaner", hcb_cleaner, NULL);
 	memset(&hcb_root, 0, sizeof hcb_root);
 	hcb_build_bittbl();
 }



From phk at varnish-cache.org  Mon Dec 26 09:49:00 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 10:49:00 +0100
Subject: [master] df85ad8 Introduce a local "req" parameter in the cnt_*
	states,
	and pass wrk and req in as paramters to shave a few source lines
Message-ID: <E1Rf7Ay-0001ch-Ur@project.varnish-software.com>

commit df85ad845ef28488781130a3115a117e09227660
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 09:48:23 2011 +0000

    Introduce a local "req" parameter in the cnt_* states, and pass wrk and req
    in as paramters to shave a few source lines

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index c048b5a..c919b32 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -127,7 +127,7 @@ typedef struct {
 /*--------------------------------------------------------------------*/
 
 enum step {
-#define STEP(l, u)	STP_##u,
+#define STEP(l, u, arg)	STP_##u,
 #include "tbl/steps.h"
 #undef STEP
 };
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 0154577..298b7b4 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -97,28 +97,28 @@ DOT }
  */
 
 static int
-cnt_wait(struct sess *sp)
+cnt_wait(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	int i, j, tmo;
 	struct pollfd pfd[1];
-	struct worker *wrk;
 	double now, when;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	if (sp->req == NULL) {
+	if (req == NULL) {
 		SES_GetReq(sp);
-		HTC_Init(sp->req->htc, sp->req->ws, sp->fd, sp->vsl_id,
+		req = sp->req;
+		CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+		HTC_Init(req->htc, req->ws, sp->fd, sp->vsl_id,
 		    cache_param->http_req_size,
 		    cache_param->http_req_hdr_len);
 	}
 
-	AZ(sp->req->vcl);
+	AZ(req->vcl);
 	AZ(wrk->obj);
-	AZ(sp->req->esi_level);
-	assert(sp->req->xid == 0);
-	sp->req->t_resp = NAN;
+	AZ(req->esi_level);
+	assert(req->xid == 0);
+	req->t_resp = NAN;
 
 	assert(!isnan(sp->t_req));
 	tmo = (int)(1e3 * cache_param->timeout_linger);
@@ -130,9 +130,9 @@ cnt_wait(struct sess *sp)
 		assert(j >= 0);
 		now = VTIM_real();
 		if (j != 0)
-			i = HTC_Rx(sp->req->htc);
+			i = HTC_Rx(req->htc);
 		else
-			i = HTC_Complete(sp->req->htc);
+			i = HTC_Complete(req->htc);
 		if (i == 1) {
 			/* Got it, run with it */
 			sp->t_req = now;
@@ -206,16 +206,15 @@ DOT }
  */
 
 static int
-cnt_prepresp(struct sess *sp)
+cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 
 	if (wrk->busyobj != NULL) {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -234,13 +233,13 @@ cnt_prepresp(struct sess *sp)
 	    !wrk->busyobj->do_gzip && !wrk->busyobj->do_gunzip)
 		wrk->res_mode |= RES_LEN;
 
-	if (!sp->req->disable_esi && wrk->obj->esidata != NULL) {
+	if (!req->disable_esi && wrk->obj->esidata != NULL) {
 		/* In ESI mode, we don't know the aggregate length */
 		wrk->res_mode &= ~RES_LEN;
 		wrk->res_mode |= RES_ESI;
 	}
 
-	if (sp->req->esi_level > 0) {
+	if (req->esi_level > 0) {
 		wrk->res_mode &= ~RES_LEN;
 		wrk->res_mode |= RES_ESI_CHILD;
 	}
@@ -263,32 +262,32 @@ cnt_prepresp(struct sess *sp)
 			 * can make it any different size
 			 */
 			wrk->res_mode |= RES_LEN;
-		else if (!sp->req->wantbody) {
+		else if (!req->wantbody) {
 			/* Nothing */
-		} else if (sp->req->http->protover >= 11) {
+		} else if (req->http->protover >= 11) {
 			wrk->res_mode |= RES_CHUNKED;
 		} else {
 			wrk->res_mode |= RES_EOF;
-			sp->req->doclose = "EOF mode";
+			req->doclose = "EOF mode";
 		}
 	}
 
-	sp->req->t_resp = W_TIM_real(wrk);
+	req->t_resp = W_TIM_real(wrk);
 	if (wrk->obj->objcore != NULL) {
-		if ((sp->req->t_resp - wrk->obj->last_lru) >
+		if ((req->t_resp - wrk->obj->last_lru) >
 		    cache_param->lru_timeout &&
 		    EXP_Touch(wrk->obj->objcore))
-			wrk->obj->last_lru = sp->req->t_resp;
-		wrk->obj->last_use = sp->req->t_resp;	/* XXX: locking ? */
+			wrk->obj->last_lru = req->t_resp;
+		wrk->obj->last_use = req->t_resp;	/* XXX: locking ? */
 	}
-	http_Setup(sp->req->resp, sp->req->ws);
+	http_Setup(req->resp, req->ws);
 	RES_BuildHttp(sp);
 	VCL_deliver_method(sp);
-	switch (sp->req->handling) {
+	switch (req->handling) {
 	case VCL_RET_DELIVER:
 		break;
 	case VCL_RET_RESTART:
-		if (sp->req->restarts >= cache_param->max_restarts)
+		if (req->restarts >= cache_param->max_restarts)
 			break;
 		if (wrk->busyobj != NULL) {
 			AN(wrk->busyobj->do_stream);
@@ -299,9 +298,9 @@ cnt_prepresp(struct sess *sp)
 			(void)HSH_Deref(wrk, NULL, &wrk->obj);
 		}
 		AZ(wrk->obj);
-		sp->req->restarts++;
-		sp->req->director = NULL;
-		http_Setup(sp->req->resp, NULL);
+		req->restarts++;
+		req->director = NULL;
+		http_Setup(req->resp, NULL);
 		sp->step = STP_RECV;
 		return (0);
 	default:
@@ -332,24 +331,22 @@ DOT deliver -> DONE [style=bold,color=blue]
  */
 
 static int
-cnt_deliver(struct sess *sp)
+cnt_deliver(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
-
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	AZ(sp->wrk->busyobj);
-	sp->req->director = NULL;
-	sp->req->restarts = 0;
+	req->director = NULL;
+	req->restarts = 0;
 
 	RES_WriteObj(sp);
 
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
-	http_Setup(sp->req->resp, NULL);
+	http_Setup(req->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
 }
@@ -369,72 +366,71 @@ DOT	DONE -> ESI_RESP
  */
 
 static int
-cnt_done(struct sess *sp)
+cnt_done(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	double dh, dp, da;
 	int i;
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_ORNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	CHECK_OBJ_ORNULL(req->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
-	sp->req->director = NULL;
-	sp->req->restarts = 0;
+	req->director = NULL;
+	req->restarts = 0;
 
 	wrk->busyobj = NULL;
 
 	SES_Charge(sp);
 
 	/* If we did an ESI include, don't mess up our state */
-	if (sp->req->esi_level > 0)
+	if (req->esi_level > 0)
 		return (1);
 
-	if (sp->req->vcl != NULL) {
+	if (req->vcl != NULL) {
 		if (wrk->vcl != NULL)
 			VCL_Rel(&wrk->vcl);
-		wrk->vcl = sp->req->vcl;
-		sp->req->vcl = NULL;
+		wrk->vcl = req->vcl;
+		req->vcl = NULL;
 	}
 
 
 	sp->t_idle = W_TIM_real(wrk);
-	if (sp->req->xid == 0) {
-		sp->req->t_resp = sp->t_idle;
+	if (req->xid == 0) {
+		req->t_resp = sp->t_idle;
 	} else {
-		dp = sp->req->t_resp - sp->t_req;
-		da = sp->t_idle - sp->req->t_resp;
+		dp = req->t_resp - sp->t_req;
+		da = sp->t_idle - req->t_resp;
 		dh = sp->t_req - sp->t_open;
 		/* XXX: Add StatReq == StatSess */
 		/* XXX: Workaround for pipe */
 		if (sp->fd >= 0) {
 			WSP(sp, SLT_Length, "%ju",
-			    (uintmax_t)sp->req->req_bodybytes);
+			    (uintmax_t)req->req_bodybytes);
 		}
 		WSP(sp, SLT_ReqEnd, "%u %.9f %.9f %.9f %.9f %.9f",
-		    sp->req->xid, sp->t_req, sp->t_idle, dh, dp, da);
+		    req->xid, sp->t_req, sp->t_idle, dh, dp, da);
 	}
-	sp->req->xid = 0;
+	req->xid = 0;
 	WSL_Flush(wrk, 0);
 
 	sp->t_req = NAN;
-	sp->req->t_resp = NAN;
+	req->t_resp = NAN;
 
-	sp->req->req_bodybytes = 0;
+	req->req_bodybytes = 0;
 
-	sp->req->hash_always_miss = 0;
-	sp->req->hash_ignore_busy = 0;
+	req->hash_always_miss = 0;
+	req->hash_ignore_busy = 0;
 
-	if (sp->fd >= 0 && sp->req->doclose != NULL) {
+	if (sp->fd >= 0 && req->doclose != NULL) {
 		/*
 		 * This is an orderly close of the connection; ditch nolinger
 		 * before we close, to get queued data transmitted.
 		 */
 		// XXX: not yet (void)VTCP_linger(sp->fd, 0);
-		SES_Close(sp, sp->req->doclose);
+		SES_Close(sp, req->doclose);
 	}
 
 	if (sp->fd < 0) {
@@ -446,17 +442,17 @@ cnt_done(struct sess *sp)
 	if (wrk->stats.client_req >= cache_param->wthread_stats_rate)
 		WRK_SumStat(wrk);
 	/* Reset the workspace to the session-watermark */
-	WS_Reset(sp->req->ws, NULL);
+	WS_Reset(req->ws, NULL);
 	WS_Reset(wrk->ws, NULL);
 
-	i = HTC_Reinit(sp->req->htc);
+	i = HTC_Reinit(req->htc);
 	if (i == 1) {
 		wrk->stats.sess_pipeline++;
 		sp->t_req = sp->t_idle;
 		sp->step = STP_START;
 		return (0);
 	}
-	if (Tlen(sp->req->htc->rxbuf))
+	if (Tlen(req->htc->rxbuf))
 		wrk->stats.sess_readahead++;
 	sp->step = STP_WAIT;
 	sp->t_req = sp->t_idle;
@@ -479,15 +475,14 @@ DOT rsterr [label="RESTART",shape=plaintext]
  */
 
 static int
-cnt_error(struct sess *sp)
+cnt_error(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	struct http *h;
 	char date[40];
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	if (wrk->obj == NULL) {
 		HSH_Prealloc(sp);
@@ -500,15 +495,15 @@ cnt_error(struct sess *sp)
 			    cache_param->http_resp_size,
 			    (uint16_t)cache_param->http_max_hdr);
 		if (wrk->obj == NULL) {
-			sp->req->doclose = "Out of objects";
-			sp->req->director = NULL;
+			req->doclose = "Out of objects";
+			req->director = NULL;
 			http_Setup(wrk->busyobj->beresp, NULL);
 			http_Setup(wrk->busyobj->bereq, NULL);
 			sp->step = STP_DONE;
 			return(0);
 		}
 		AN(wrk->obj);
-		wrk->obj->xid = sp->req->xid;
+		wrk->obj->xid = req->xid;
 		wrk->obj->exp.entered = sp->t_req;
 	} else {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -517,41 +512,41 @@ cnt_error(struct sess *sp)
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
 	h = wrk->obj->http;
 
-	if (sp->req->err_code < 100 || sp->req->err_code > 999)
-		sp->req->err_code = 501;
+	if (req->err_code < 100 || req->err_code > 999)
+		req->err_code = 501;
 
 	http_PutProtocol(wrk, sp->vsl_id, h, "HTTP/1.1");
-	http_PutStatus(h, sp->req->err_code);
+	http_PutStatus(h, req->err_code);
 	VTIM_format(W_TIM_real(wrk), date);
 	http_PrintfHeader(wrk, sp->vsl_id, h, "Date: %s", date);
 	http_SetHeader(wrk, sp->vsl_id, h, "Server: Varnish");
 
-	if (sp->req->err_reason != NULL)
-		http_PutResponse(wrk, sp->vsl_id, h, sp->req->err_reason);
+	if (req->err_reason != NULL)
+		http_PutResponse(wrk, sp->vsl_id, h, req->err_reason);
 	else
 		http_PutResponse(wrk, sp->vsl_id, h,
-		    http_StatusMessage(sp->req->err_code));
+		    http_StatusMessage(req->err_code));
 	VCL_error_method(sp);
 
-	if (sp->req->handling == VCL_RET_RESTART &&
-	    sp->req->restarts <  cache_param->max_restarts) {
+	if (req->handling == VCL_RET_RESTART &&
+	    req->restarts <  cache_param->max_restarts) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
-		sp->req->director = NULL;
-		sp->req->restarts++;
+		req->director = NULL;
+		req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
-	} else if (sp->req->handling == VCL_RET_RESTART)
-		sp->req->handling = VCL_RET_DELIVER;
+	} else if (req->handling == VCL_RET_RESTART)
+		req->handling = VCL_RET_DELIVER;
 
 
 	/* We always close when we take this path */
-	sp->req->doclose = "error";
-	sp->req->wantbody = 1;
+	req->doclose = "error";
+	req->wantbody = 1;
 
-	assert(sp->req->handling == VCL_RET_DELIVER);
-	sp->req->err_code = 0;
-	sp->req->err_reason = NULL;
+	assert(req->handling == VCL_RET_DELIVER);
+	req->err_code = 0;
+	req->err_reason = NULL;
 	http_Setup(wrk->busyobj->bereq, NULL);
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	sp->step = STP_PREPRESP;
@@ -588,19 +583,18 @@ DOT errfetch [label="ERROR",shape=plaintext]
  */
 
 static int
-cnt_fetch(struct sess *sp)
+cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	int i, need_host_hdr;
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
-	AN(sp->req->director);
+	AN(req->director);
 	AZ(wrk->busyobj->vbc);
 	AZ(wrk->busyobj->should_close);
 	AZ(wrk->storage_hint);
@@ -621,8 +615,8 @@ cnt_fetch(struct sess *sp)
 	}
 
 	if (i) {
-		sp->req->handling = VCL_RET_ERROR;
-		sp->req->err_code = 503;
+		req->handling = VCL_RET_ERROR;
+		req->err_code = 503;
 	} else {
 		/*
 		 * These two headers can be spread over multiple actual headers
@@ -639,7 +633,7 @@ cnt_fetch(struct sess *sp)
 		 */
 		wrk->busyobj->body_status = RFC2616_Body(sp);
 
-		sp->req->err_code = http_GetStatus(wrk->busyobj->beresp);
+		req->err_code = http_GetStatus(wrk->busyobj->beresp);
 
 		/*
 		 * What does RFC2616 think about TTL ?
@@ -656,7 +650,7 @@ cnt_fetch(struct sess *sp)
 
 		VCL_fetch_method(sp);
 
-		switch (sp->req->handling) {
+		switch (req->handling) {
 		case VCL_RET_HIT_FOR_PASS:
 			if (wrk->objcore != NULL)
 				wrk->objcore->flags |= OC_F_PASS;
@@ -683,12 +677,12 @@ cnt_fetch(struct sess *sp)
 		wrk->objcore = NULL;
 	}
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
-	sp->req->director = NULL;
+	req->director = NULL;
 	wrk->storage_hint = NULL;
 
-	switch (sp->req->handling) {
+	switch (req->handling) {
 	case VCL_RET_RESTART:
-		sp->req->restarts++;
+		req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
 	case VCL_RET_ERROR:
@@ -721,7 +715,7 @@ DOT fetchbody2 -> prepresp [style=bold,color=blue]
 
 
 static int
-cnt_fetchbody(struct sess *sp)
+cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	int i;
 	struct http *hp, *hp2;
@@ -730,22 +724,21 @@ cnt_fetchbody(struct sess *sp)
 	unsigned l;
 	struct vsb *vary = NULL;
 	int varyl = 0, pass;
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 
-	assert(sp->req->handling == VCL_RET_HIT_FOR_PASS ||
-	    sp->req->handling == VCL_RET_DELIVER);
+	assert(req->handling == VCL_RET_HIT_FOR_PASS ||
+	    req->handling == VCL_RET_DELIVER);
 
 	if (wrk->objcore == NULL) {
 		/* This is a pass from vcl_recv */
 		pass = 1;
 		/* VCL may have fiddled this, but that doesn't help */
 		wrk->busyobj->exp.ttl = -1.;
-	} else if (sp->req->handling == VCL_RET_HIT_FOR_PASS) {
+	} else if (req->handling == VCL_RET_HIT_FOR_PASS) {
 		/* pass from vcl_fetch{} -> hit-for-pass */
 		/* XXX: the bereq was not filtered pass... */
 		pass = 1;
@@ -810,9 +803,9 @@ cnt_fetchbody(struct sess *sp)
 	else if (wrk->busyobj->is_gzip)
 		wrk->busyobj->vfp = &vfp_testgzip;
 
-	if (wrk->busyobj->do_esi || sp->req->esi_level > 0)
+	if (wrk->busyobj->do_esi || req->esi_level > 0)
 		wrk->busyobj->do_stream = 0;
-	if (!sp->req->wantbody)
+	if (!req->wantbody)
 		wrk->busyobj->do_stream = 0;
 
 	l = http_EstimateWS(wrk->busyobj->beresp,
@@ -852,7 +845,7 @@ cnt_fetchbody(struct sess *sp)
 		wrk->busyobj->exp.keep = 0.0;
 	}
 	if (wrk->obj == NULL) {
-		sp->req->err_code = 503;
+		req->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
@@ -874,8 +867,8 @@ cnt_fetchbody(struct sess *sp)
 		VSB_delete(vary);
 	}
 
-	wrk->obj->xid = sp->req->xid;
-	wrk->obj->response = sp->req->err_code;
+	wrk->obj->xid = req->xid;
+	wrk->obj->response = req->err_code;
 	WS_Assert(wrk->obj->ws_o);
 
 	/* Filter into object */
@@ -901,7 +894,7 @@ cnt_fetchbody(struct sess *sp)
 	 * that allow the 304, in which case we return 200 non-stream.
 	 */
 	if (wrk->obj->response == 200 &&
-	    sp->req->http->conds &&
+	    req->http->conds &&
 	    RFC2616_Do_Cond(sp))
 		wrk->busyobj->do_stream = 0;
 
@@ -920,13 +913,13 @@ cnt_fetchbody(struct sess *sp)
 	wrk->busyobj->vfp = NULL;
 	assert(WRW_IsReleased(wrk));
 	AZ(wrk->busyobj->vbc);
-	AN(sp->req->director);
+	AN(req->director);
 
 	if (i) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		AZ(wrk->obj);
-		sp->req->err_code = 503;
+		req->err_code = 503;
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -955,17 +948,16 @@ DOT streambody -> DONE [style=bold,color=cyan]
  */
 
 static int
-cnt_streambody(struct sess *sp)
+cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	int i;
 	struct stream_ctx sctx;
 	uint8_t obuf[sp->wrk->res_mode & RES_GUNZIP ?
 	    cache_param->gzip_stack_buffer : 1];
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	memset(&sctx, 0, sizeof sctx);
@@ -989,7 +981,7 @@ cnt_streambody(struct sess *sp)
 	http_Setup(wrk->busyobj->beresp, NULL);
 	wrk->busyobj->vfp = NULL;
 	AZ(wrk->busyobj->vbc);
-	AN(sp->req->director);
+	AN(req->director);
 
 	if (!i && wrk->obj->objcore != NULL) {
 		EXP_Insert(wrk->obj);
@@ -997,11 +989,11 @@ cnt_streambody(struct sess *sp)
 		AN(wrk->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	} else {
-		sp->req->doclose = "Stream error";
+		req->doclose = "Stream error";
 	}
 	wrk->acct_tmp.fetch++;
-	sp->req->director = NULL;
-	sp->req->restarts = 0;
+	req->director = NULL;
+	req->restarts = 0;
 
 	RES_StreamEnd(sp);
 	if (wrk->res_mode & RES_GUNZIP)
@@ -1012,7 +1004,7 @@ cnt_streambody(struct sess *sp)
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
-	http_Setup(sp->req->resp, NULL);
+	http_Setup(req->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
 }
@@ -1030,18 +1022,14 @@ DOT first -> wait
  */
 
 static int
-cnt_first(struct sess *sp)
+cnt_first(struct sess *sp, struct worker *wrk)
 {
-	struct worker *wrk;
 	char laddr[ADDR_BUFSIZE];
 	char lport[PORT_BUFSIZE];
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 
-	AZ(sp->req);
-
 	VTCP_name(&sp->sockaddr, sp->sockaddrlen,
 	    sp->addr, sizeof sp->addr, sp->port, sizeof sp->port);
 	if (cache_param->log_local_addr) {
@@ -1081,23 +1069,21 @@ DOT hit -> prepresp [label="deliver",style=bold,color=green]
  */
 
 static int
-cnt_hit(struct sess *sp)
+cnt_hit(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
-
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
 	assert(!(wrk->obj->objcore->flags & OC_F_PASS));
 
 	VCL_hit_method(sp);
 
-	if (sp->req->handling == VCL_RET_DELIVER) {
+	if (req->handling == VCL_RET_DELIVER) {
 		/* Dispose of any body part of the request */
 		(void)FetchReqBody(sp);
 		//AZ(wrk->busyobj->bereq->ws);
@@ -1110,7 +1096,7 @@ cnt_hit(struct sess *sp)
 	(void)HSH_Deref(wrk, NULL, &wrk->obj);
 	wrk->objcore = NULL;
 
-	switch(sp->req->handling) {
+	switch(req->handling) {
 	case VCL_RET_PASS:
 		sp->step = STP_PASS;
 		return (0);
@@ -1118,8 +1104,8 @@ cnt_hit(struct sess *sp)
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_RESTART:
-		sp->req->director = NULL;
-		sp->req->restarts++;
+		req->director = NULL;
+		req->restarts++;
 		sp->step = STP_RECV;
 		return (0);
 	default:
@@ -1156,32 +1142,31 @@ DOT lookup -> miss [label="no",style=bold,color=blue]
  */
 
 static int
-cnt_lookup(struct sess *sp)
+cnt_lookup(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	struct objcore *oc;
 	struct object *o;
 	struct objhead *oh;
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
-	if (sp->req->hash_objhead == NULL) {
+	if (req->hash_objhead == NULL) {
 		/* Not a waiting list return */
-		AZ(sp->req->vary_b);
-		AZ(sp->req->vary_l);
-		AZ(sp->req->vary_e);
-		(void)WS_Reserve(sp->req->ws, 0);
+		AZ(req->vary_b);
+		AZ(req->vary_l);
+		AZ(req->vary_e);
+		(void)WS_Reserve(req->ws, 0);
 	} else {
-		AN(sp->req->ws->r);
+		AN(req->ws->r);
 	}
-	sp->req->vary_b = (void*)sp->req->ws->f;
-	sp->req->vary_e = (void*)sp->req->ws->r;
-	sp->req->vary_b[2] = '\0';
+	req->vary_b = (void*)req->ws->f;
+	req->vary_e = (void*)req->ws->r;
+	req->vary_b[2] = '\0';
 
 	oc = HSH_Lookup(sp, &oh);
 
@@ -1203,17 +1188,17 @@ cnt_lookup(struct sess *sp)
 	if (oc->flags & OC_F_BUSY) {
 		wrk->stats.cache_miss++;
 
-		if (sp->req->vary_l != NULL) {
-			assert(oc->busyobj->vary == sp->req->vary_b);
+		if (req->vary_l != NULL) {
+			assert(oc->busyobj->vary == req->vary_b);
 			VRY_Validate(oc->busyobj->vary);
-			WS_ReleaseP(sp->req->ws, (void*)sp->req->vary_l);
+			WS_ReleaseP(req->ws, (void*)req->vary_l);
 		} else {
 			AZ(oc->busyobj->vary);
-			WS_Release(sp->req->ws, 0);
+			WS_Release(req->ws, 0);
 		}
-		sp->req->vary_b = NULL;
-		sp->req->vary_l = NULL;
-		sp->req->vary_e = NULL;
+		req->vary_b = NULL;
+		req->vary_l = NULL;
+		req->vary_e = NULL;
 
 		wrk->objcore = oc;
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
@@ -1225,10 +1210,10 @@ cnt_lookup(struct sess *sp)
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	wrk->obj = o;
 
-	WS_Release(sp->req->ws, 0);
-	sp->req->vary_b = NULL;
-	sp->req->vary_l = NULL;
-	sp->req->vary_e = NULL;
+	WS_Release(req->ws, 0);
+	req->vary_b = NULL;
+	req->vary_l = NULL;
+	req->vary_e = NULL;
 
 	if (oc->flags & OC_F_PASS) {
 		wrk->stats.cache_hitpass++;
@@ -1269,14 +1254,13 @@ DOT
  */
 
 static int
-cnt_miss(struct sess *sp)
+cnt_miss(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 
 	AZ(wrk->obj);
 	AN(wrk->objcore);
@@ -1302,7 +1286,7 @@ cnt_miss(struct sess *sp)
 
 	VCL_miss_method(sp);
 
-	switch(sp->req->handling) {
+	switch(req->handling) {
 	case VCL_RET_ERROR:
 		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
 		wrk->objcore = NULL;
@@ -1363,14 +1347,12 @@ DOT err_pass [label="ERROR",shape=plaintext]
  */
 
 static int
-cnt_pass(struct sess *sp)
+cnt_pass(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
-
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 
@@ -1384,15 +1366,15 @@ cnt_pass(struct sess *sp)
 	wrk->first_byte_timeout = 0;
 	wrk->between_bytes_timeout = 0;
 	VCL_pass_method(sp);
-	if (sp->req->handling == VCL_RET_ERROR) {
+	if (req->handling == VCL_RET_ERROR) {
 		http_Setup(wrk->busyobj->bereq, NULL);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	}
-	assert(sp->req->handling == VCL_RET_PASS);
+	assert(req->handling == VCL_RET_PASS);
 	wrk->acct_tmp.pass++;
-	sp->req->sendbody = 1;
+	req->sendbody = 1;
 	sp->step = STP_FETCH;
 	return (0);
 }
@@ -1423,14 +1405,13 @@ DOT err_pipe [label="ERROR",shape=plaintext]
  */
 
 static int
-cnt_pipe(struct sess *sp)
+cnt_pipe(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
 	wrk->acct_tmp.pipe++;
@@ -1442,9 +1423,9 @@ cnt_pipe(struct sess *sp)
 
 	VCL_pipe_method(sp);
 
-	if (sp->req->handling == VCL_RET_ERROR)
+	if (req->handling == VCL_RET_ERROR)
 		INCOMPL();
-	assert(sp->req->handling == VCL_RET_PIPE);
+	assert(req->handling == VCL_RET_PIPE);
 
 	PipeSession(sp);
 	assert(WRW_IsReleased(wrk));
@@ -1475,37 +1456,36 @@ DOT recv -> hash [label="lookup",style=bold,color=green]
  */
 
 static int
-cnt_recv(struct sess *sp)
+cnt_recv(struct sess *sp, struct worker *wrk, struct req *req)
 {
-	struct worker *wrk;
 	unsigned recv_handling;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req->vcl, VCL_CONF_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->obj);
 	AZ(wrk->busyobj);
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 
 	/* By default we use the first backend */
-	AZ(sp->req->director);
-	sp->req->director = sp->req->vcl->director[0];
-	AN(sp->req->director);
+	AZ(req->director);
+	req->director = req->vcl->director[0];
+	AN(req->director);
 
-	sp->req->disable_esi = 0;
-	sp->req->hash_always_miss = 0;
-	sp->req->hash_ignore_busy = 0;
-	sp->req->client_identity = NULL;
+	req->disable_esi = 0;
+	req->hash_always_miss = 0;
+	req->hash_ignore_busy = 0;
+	req->client_identity = NULL;
 
-	http_CollectHdr(sp->req->http, H_Cache_Control);
+	http_CollectHdr(req->http, H_Cache_Control);
 
 	VCL_recv_method(sp);
-	recv_handling = sp->req->handling;
+	recv_handling = req->handling;
 
-	if (sp->req->restarts >= cache_param->max_restarts) {
-		if (sp->req->err_code == 0)
-			sp->req->err_code = 503;
+	if (req->restarts >= cache_param->max_restarts) {
+		if (req->err_code == 0)
+			req->err_code = 503;
 		sp->step = STP_ERROR;
 		return (0);
 	}
@@ -1514,32 +1494,32 @@ cnt_recv(struct sess *sp)
 	     (recv_handling != VCL_RET_PIPE) &&
 	     (recv_handling != VCL_RET_PASS)) {
 		if (RFC2616_Req_Gzip(sp)) {
-			http_Unset(sp->req->http, H_Accept_Encoding);
-			http_SetHeader(wrk, sp->vsl_id, sp->req->http,
+			http_Unset(req->http, H_Accept_Encoding);
+			http_SetHeader(wrk, sp->vsl_id, req->http,
 			    "Accept-Encoding: gzip");
 		} else {
-			http_Unset(sp->req->http, H_Accept_Encoding);
+			http_Unset(req->http, H_Accept_Encoding);
 		}
 	}
 
 	SHA256_Init(wrk->sha256ctx);
 	VCL_hash_method(sp);
-	assert(sp->req->handling == VCL_RET_HASH);
-	SHA256_Final(sp->req->digest, wrk->sha256ctx);
+	assert(req->handling == VCL_RET_HASH);
+	SHA256_Final(req->digest, wrk->sha256ctx);
 
-	if (!strcmp(sp->req->http->hd[HTTP_HDR_REQ].b, "HEAD"))
-		sp->req->wantbody = 0;
+	if (!strcmp(req->http->hd[HTTP_HDR_REQ].b, "HEAD"))
+		req->wantbody = 0;
 	else
-		sp->req->wantbody = 1;
+		req->wantbody = 1;
 
-	sp->req->sendbody = 0;
+	req->sendbody = 0;
 	switch(recv_handling) {
 	case VCL_RET_LOOKUP:
 		/* XXX: discard req body, if any */
 		sp->step = STP_LOOKUP;
 		return (0);
 	case VCL_RET_PIPE:
-		if (sp->req->esi_level > 0) {
+		if (req->esi_level > 0) {
 			/* XXX: VSL something */
 			INCOMPL();
 			/* sp->step = STP_DONE; */
@@ -1572,22 +1552,20 @@ DOT start -> DONE [label=errors]
  */
 
 static int
-cnt_start(struct sess *sp)
+cnt_start(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	uint16_t done;
 	char *p;
 	const char *r = "HTTP/1.1 100 Continue\r\n\r\n";
-	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-	AZ(sp->req->restarts);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	AZ(req->restarts);
 	AZ(wrk->obj);
-	AZ(sp->req->vcl);
-	EXP_Clr(&sp->req->exp);
-	AZ(sp->req->esi_level);
+	AZ(req->vcl);
+	EXP_Clr(&req->exp);
+	AZ(req->esi_level);
 
 	/* Update stats of various sorts */
 	wrk->stats.client_req++;
@@ -1595,15 +1573,15 @@ cnt_start(struct sess *sp)
 	wrk->acct_tmp.req++;
 
 	/* Assign XID and log */
-	sp->req->xid = ++xids;				/* XXX not locked */
-	WSP(sp, SLT_ReqStart, "%s %s %u", sp->addr, sp->port,  sp->req->xid);
+	req->xid = ++xids;				/* XXX not locked */
+	WSP(sp, SLT_ReqStart, "%s %s %u", sp->addr, sp->port,  req->xid);
 
 	/* Borrow VCL reference from worker thread */
 	VCL_Refresh(&wrk->vcl);
-	sp->req->vcl = wrk->vcl;
+	req->vcl = wrk->vcl;
 	wrk->vcl = NULL;
 
-	http_Setup(sp->req->http, sp->req->ws);
+	http_Setup(req->http, req->ws);
 	done = http_DissectRequest(sp);
 
 	/* If we could not even parse the request, just close */
@@ -1614,27 +1592,27 @@ cnt_start(struct sess *sp)
 	}
 
 	/* Catch request snapshot */
-	sp->req->ws_req = WS_Snapshot(sp->req->ws);
+	req->ws_req = WS_Snapshot(req->ws);
 
 	/* Catch original request, before modification */
-	HTTP_Copy(sp->req->http0, sp->req->http);
+	HTTP_Copy(req->http0, req->http);
 
 	if (done != 0) {
-		sp->req->err_code = done;
+		req->err_code = done;
 		sp->step = STP_ERROR;
 		return (0);
 	}
 
-	sp->req->doclose = http_DoConnection(sp->req->http);
+	req->doclose = http_DoConnection(req->http);
 
 	/* XXX: Handle TRACE & OPTIONS of Max-Forwards = 0 */
 
 	/*
 	 * Handle Expect headers
 	 */
-	if (http_GetHdr(sp->req->http, H_Expect, &p)) {
+	if (http_GetHdr(req->http, H_Expect, &p)) {
 		if (strcasecmp(p, "100-continue")) {
-			sp->req->err_code = 417;
+			req->err_code = 417;
 			sp->step = STP_ERROR;
 			return (0);
 		}
@@ -1645,7 +1623,7 @@ cnt_start(struct sess *sp)
 		 * XXX: because we use http0 as our basis.  Believed
 		 * XXX: safe, but potentially confusing.
 		 */
-		http_Unset(sp->req->http, H_Expect);
+		http_Unset(req->http, H_Expect);
 	}
 
 	sp->step = STP_RECV;
@@ -1688,8 +1666,8 @@ CNT_Session(struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 #if 0
-	CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-	MPL_AssertSane(sp->req);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	MPL_AssertSane(req);
 #endif
 	wrk = sp->wrk;
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
@@ -1729,8 +1707,8 @@ CNT_Session(struct sess *sp)
 	for (done = 0; !done; ) {
 		assert(sp->wrk == wrk);
 #if 0
-		CHECK_OBJ_NOTNULL(sp->req, REQ_MAGIC);
-		MPL_AssertSane(sp->req);
+		CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+		MPL_AssertSane(req);
 #endif
 		/*
 		 * This is a good place to be paranoid about the various
@@ -1743,11 +1721,11 @@ CNT_Session(struct sess *sp)
 		WS_Assert(wrk->ws);
 
 		switch (sp->step) {
-#define STEP(l,u) \
+#define STEP(l,u,arg) \
 		    case STP_##u: \
 			if (cache_param->diag_bitmap & 0x01) \
 				cnt_diag(sp, #u); \
-			done = cnt_##l(sp); \
+			done = cnt_##l arg; \
 		        break;
 #include "tbl/steps.h"
 #undef STEP
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 9c26eef..80f61a4 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -238,7 +238,7 @@ pan_sess(const struct sess *sp)
 	    sp->addr ? sp->addr : "?.?.?.?",
 	    sp->port ? sp->port : "?");
 	switch (sp->step) {
-#define STEP(l, u) case STP_##u: stp = "STP_" #u; break;
+#define STEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
 #include "tbl/steps.h"
 #undef STEP
 		default: stp = NULL;
diff --git a/include/tbl/steps.h b/include/tbl/steps.h
index c88e434..6fcd74e 100644
--- a/include/tbl/steps.h
+++ b/include/tbl/steps.h
@@ -29,20 +29,20 @@
  */
 
 /*lint -save -e525 -e539 */
-STEP(wait,	WAIT)
-STEP(first,	FIRST)
-STEP(recv,	RECV)
-STEP(start,	START)
-STEP(pipe,	PIPE)
-STEP(pass,	PASS)
-STEP(lookup,	LOOKUP)
-STEP(miss,	MISS)
-STEP(hit,	HIT)
-STEP(fetch,	FETCH)
-STEP(fetchbody,	FETCHBODY)
-STEP(streambody,STREAMBODY)
-STEP(prepresp,	PREPRESP)
-STEP(deliver,	DELIVER)
-STEP(error,	ERROR)
-STEP(done,	DONE)
+STEP(wait,		WAIT,		(sp, sp->wrk, sp->req))
+STEP(first,		FIRST,		(sp, sp->wrk))
+STEP(recv,		RECV,		(sp, sp->wrk, sp->req))
+STEP(start,		START,		(sp, sp->wrk, sp->req))
+STEP(pipe,		PIPE,		(sp, sp->wrk, sp->req))
+STEP(pass,		PASS,		(sp, sp->wrk, sp->req))
+STEP(lookup,		LOOKUP,		(sp, sp->wrk, sp->req))
+STEP(miss,		MISS,		(sp, sp->wrk, sp->req))
+STEP(hit,		HIT,		(sp, sp->wrk, sp->req))
+STEP(fetch,		FETCH,		(sp, sp->wrk, sp->req))
+STEP(fetchbody,		FETCHBODY,	(sp, sp->wrk, sp->req))
+STEP(streambody,	STREAMBODY,	(sp, sp->wrk, sp->req))
+STEP(prepresp,		PREPRESP,	(sp, sp->wrk, sp->req))
+STEP(deliver,		DELIVER,	(sp, sp->wrk, sp->req))
+STEP(error,		ERROR,		(sp, sp->wrk, sp->req))
+STEP(done,		DONE,		(sp, sp->wrk, sp->req))
 /*lint -restore */



From phk at varnish-cache.org  Mon Dec 26 10:03:07 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 11:03:07 +0100
Subject: [master] 6c14864 move obj and objcore from worker to req
Message-ID: <E1Rf7Od-0002ya-HK@project.varnish-software.com>

commit 6c148642883f466b15281ad8799ecbce23c3954b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 10:02:54 2011 +0000

    move obj and objcore from worker to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index c919b32..71b2c83 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -329,8 +329,6 @@ struct worker {
 
 	struct ws		ws[1];
 
-	struct object		*obj;
-	struct objcore		*objcore;
 	struct busyobj		*busyobj;
 
 	/* This is only here so VRT can find it */
@@ -622,6 +620,8 @@ struct req {
 	struct http		*resp;
 
 	struct ws		ws[1];
+	struct object		*obj;
+	struct objcore		*objcore;
 };
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 24aedb4..b683300 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -227,7 +227,7 @@ vbe_NewConn(void)
 
 /*--------------------------------------------------------------------
  * It evaluates if a backend is healthy _for_a_specific_object_.
- * That means that it relies on sp->wrk->objcore->objhead. This is mainly for
+ * That means that it relies on sp->req->objcore->objhead. This is mainly for
  * saint-mode, but also takes backend->healthy into account. If
  * cache_param->saintmode_threshold is 0, this is basically just a test of
  * backend->healthy.
@@ -274,11 +274,11 @@ vbe_Healthy(const struct vdi_simple *vs, const struct sess *sp)
 	if (threshold == 0)
 		return (1);
 
-	if (sp->wrk->objcore == NULL)
+	if (sp->req->objcore == NULL)
 		return (1);
 
 	now = sp->t_req;
-	target = (uintptr_t)(sp->wrk->objcore->objhead);
+	target = (uintptr_t)(sp->req->objcore->objhead);
 
 	old = NULL;
 	retval = 1;
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 298b7b4..8ee4470 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -115,7 +115,7 @@ cnt_wait(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 
 	AZ(req->vcl);
-	AZ(wrk->obj);
+	AZ(req->obj);
 	AZ(req->esi_level);
 	assert(req->xid == 0);
 	req->t_resp = NAN;
@@ -213,13 +213,13 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
+	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 
 	if (wrk->busyobj != NULL) {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 		AN(wrk->busyobj->do_stream);
-		AssertObjCorePassOrBusy(wrk->obj->objcore);
+		AssertObjCorePassOrBusy(req->obj->objcore);
 	}
 
 	wrk->res_mode = 0;
@@ -233,7 +233,7 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 	    !wrk->busyobj->do_gzip && !wrk->busyobj->do_gunzip)
 		wrk->res_mode |= RES_LEN;
 
-	if (!req->disable_esi && wrk->obj->esidata != NULL) {
+	if (!req->disable_esi && req->obj->esidata != NULL) {
 		/* In ESI mode, we don't know the aggregate length */
 		wrk->res_mode &= ~RES_LEN;
 		wrk->res_mode |= RES_ESI;
@@ -244,7 +244,7 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 		wrk->res_mode |= RES_ESI_CHILD;
 	}
 
-	if (cache_param->http_gzip_support && wrk->obj->gziped &&
+	if (cache_param->http_gzip_support && req->obj->gziped &&
 	    !RFC2616_Req_Gzip(sp)) {
 		/*
 		 * We don't know what it uncompresses to
@@ -255,7 +255,7 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 
 	if (!(wrk->res_mode & (RES_LEN|RES_CHUNKED|RES_EOF))) {
-		if (wrk->obj->len == 0 &&
+		if (req->obj->len == 0 &&
 		    (wrk->busyobj == NULL || !wrk->busyobj->do_stream))
 			/*
 			 * If the object is empty, neither ESI nor GUNZIP
@@ -273,12 +273,12 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 
 	req->t_resp = W_TIM_real(wrk);
-	if (wrk->obj->objcore != NULL) {
-		if ((req->t_resp - wrk->obj->last_lru) >
+	if (req->obj->objcore != NULL) {
+		if ((req->t_resp - req->obj->last_lru) >
 		    cache_param->lru_timeout &&
-		    EXP_Touch(wrk->obj->objcore))
-			wrk->obj->last_lru = req->t_resp;
-		wrk->obj->last_use = req->t_resp;	/* XXX: locking ? */
+		    EXP_Touch(req->obj->objcore))
+			req->obj->last_lru = req->t_resp;
+		req->obj->last_use = req->t_resp;	/* XXX: locking ? */
 	}
 	http_Setup(req->resp, req->ws);
 	RES_BuildHttp(sp);
@@ -295,9 +295,9 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 			HSH_Drop(wrk);
 			VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		} else {
-			(void)HSH_Deref(wrk, NULL, &wrk->obj);
+			(void)HSH_Deref(wrk, NULL, &req->obj);
 		}
-		AZ(wrk->obj);
+		AZ(req->obj);
 		req->restarts++;
 		req->director = NULL;
 		http_Setup(req->resp, NULL);
@@ -307,7 +307,7 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
 		WRONG("Illegal action in vcl_deliver{}");
 	}
 	if (wrk->busyobj != NULL && wrk->busyobj->do_stream) {
-		AssertObjCorePassOrBusy(wrk->obj->objcore);
+		AssertObjCorePassOrBusy(req->obj->objcore);
 		sp->step = STP_STREAMBODY;
 	} else {
 		sp->step = STP_DELIVER;
@@ -345,7 +345,7 @@ cnt_deliver(struct sess *sp, struct worker *wrk, struct req *req)
 
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
-	(void)HSH_Deref(wrk, NULL, &wrk->obj);
+	(void)HSH_Deref(wrk, NULL, &req->obj);
 	http_Setup(req->resp, NULL);
 	sp->step = STP_DONE;
 	return (0);
@@ -376,7 +376,7 @@ cnt_done(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_ORNULL(req->vcl, VCL_CONF_MAGIC);
 
-	AZ(wrk->obj);
+	AZ(req->obj);
 	AZ(wrk->busyobj);
 	req->director = NULL;
 	req->restarts = 0;
@@ -484,17 +484,17 @@ cnt_error(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	if (wrk->obj == NULL) {
+	if (req->obj == NULL) {
 		HSH_Prealloc(sp);
 		AZ(wrk->busyobj);
 		wrk->busyobj = VBO_GetBusyObj(wrk);
-		wrk->obj = STV_NewObject(wrk, NULL, cache_param->http_resp_size,
+		req->obj = STV_NewObject(wrk, NULL, cache_param->http_resp_size,
 		     (uint16_t)cache_param->http_max_hdr);
-		if (wrk->obj == NULL)
-			wrk->obj = STV_NewObject(wrk, TRANSIENT_STORAGE,
+		if (req->obj == NULL)
+			req->obj = STV_NewObject(wrk, TRANSIENT_STORAGE,
 			    cache_param->http_resp_size,
 			    (uint16_t)cache_param->http_max_hdr);
-		if (wrk->obj == NULL) {
+		if (req->obj == NULL) {
 			req->doclose = "Out of objects";
 			req->director = NULL;
 			http_Setup(wrk->busyobj->beresp, NULL);
@@ -502,15 +502,15 @@ cnt_error(struct sess *sp, struct worker *wrk, struct req *req)
 			sp->step = STP_DONE;
 			return(0);
 		}
-		AN(wrk->obj);
-		wrk->obj->xid = req->xid;
-		wrk->obj->exp.entered = sp->t_req;
+		AN(req->obj);
+		req->obj->xid = req->xid;
+		req->obj->exp.entered = sp->t_req;
 	} else {
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 		/* XXX: Null the headers ? */
 	}
-	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
-	h = wrk->obj->http;
+	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
+	h = req->obj->http;
 
 	if (req->err_code < 100 || req->err_code > 999)
 		req->err_code = 501;
@@ -643,7 +643,7 @@ cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 		RFC2616_Ttl(sp);
 
 		/* pass from vclrecv{} has negative TTL */
-		if (wrk->objcore == NULL)
+		if (req->objcore == NULL)
 			wrk->busyobj->exp.ttl = -1.;
 
 		AZ(wrk->busyobj->do_esi);
@@ -652,12 +652,12 @@ cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 
 		switch (req->handling) {
 		case VCL_RET_HIT_FOR_PASS:
-			if (wrk->objcore != NULL)
-				wrk->objcore->flags |= OC_F_PASS;
+			if (req->objcore != NULL)
+				req->objcore->flags |= OC_F_PASS;
 			sp->step = STP_FETCHBODY;
 			return (0);
 		case VCL_RET_DELIVER:
-			AssertObjCorePassOrBusy(wrk->objcore);
+			AssertObjCorePassOrBusy(req->objcore);
 			sp->step = STP_FETCHBODY;
 			return (0);
 		default:
@@ -671,10 +671,10 @@ cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 	/* Clean up partial fetch */
 	AZ(wrk->busyobj->vbc);
 
-	if (wrk->objcore != NULL) {
-		CHECK_OBJ_NOTNULL(wrk->objcore, OBJCORE_MAGIC);
-		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
-		wrk->objcore = NULL;
+	if (req->objcore != NULL) {
+		CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
+		AZ(HSH_Deref(wrk, req->objcore, NULL));
+		req->objcore = NULL;
 	}
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	req->director = NULL;
@@ -733,7 +733,7 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	assert(req->handling == VCL_RET_HIT_FOR_PASS ||
 	    req->handling == VCL_RET_DELIVER);
 
-	if (wrk->objcore == NULL) {
+	if (req->objcore == NULL) {
 		/* This is a pass from vcl_recv */
 		pass = 1;
 		/* VCL may have fiddled this, but that doesn't help */
@@ -812,8 +812,8 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	    pass ? HTTPH_R_PASS : HTTPH_A_INS, &nhttp);
 
 	/* Create Vary instructions */
-	if (wrk->objcore != NULL) {
-		CHECK_OBJ_NOTNULL(wrk->objcore, OBJCORE_MAGIC);
+	if (req->objcore != NULL) {
+		CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
 		vary = VRY_Create(sp, wrk->busyobj->beresp);
 		if (vary != NULL) {
 			varyl = VSB_len(vary);
@@ -829,51 +829,51 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	l += strlen("Content-Length: XxxXxxXxxXxxXxxXxx") + sizeof(void *);
 
 	if (wrk->busyobj->exp.ttl < cache_param->shortlived ||
-	    wrk->objcore == NULL)
+	    req->objcore == NULL)
 		wrk->storage_hint = TRANSIENT_STORAGE;
 
-	wrk->obj = STV_NewObject(wrk, wrk->storage_hint, l, nhttp);
-	if (wrk->obj == NULL) {
+	req->obj = STV_NewObject(wrk, wrk->storage_hint, l, nhttp);
+	if (req->obj == NULL) {
 		/*
 		 * Try to salvage the transaction by allocating a
 		 * shortlived object on Transient storage.
 		 */
-		wrk->obj = STV_NewObject(wrk, TRANSIENT_STORAGE, l, nhttp);
+		req->obj = STV_NewObject(wrk, TRANSIENT_STORAGE, l, nhttp);
 		if (wrk->busyobj->exp.ttl > cache_param->shortlived)
 			wrk->busyobj->exp.ttl = cache_param->shortlived;
 		wrk->busyobj->exp.grace = 0.0;
 		wrk->busyobj->exp.keep = 0.0;
 	}
-	if (wrk->obj == NULL) {
+	if (req->obj == NULL) {
 		req->err_code = 503;
 		sp->step = STP_ERROR;
 		VDI_CloseFd(wrk, &wrk->busyobj->vbc);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		return (0);
 	}
-	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
+	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
 
 	wrk->storage_hint = NULL;
 
 	if (wrk->busyobj->do_gzip ||
 	    (wrk->busyobj->is_gzip && !wrk->busyobj->do_gunzip))
-		wrk->obj->gziped = 1;
+		req->obj->gziped = 1;
 
 	if (vary != NULL) {
-		wrk->obj->vary = (void *)WS_Alloc(wrk->obj->http->ws, varyl);
-		AN(wrk->obj->vary);
-		memcpy(wrk->obj->vary, VSB_data(vary), varyl);
-		VRY_Validate(wrk->obj->vary);
+		req->obj->vary = (void *)WS_Alloc(req->obj->http->ws, varyl);
+		AN(req->obj->vary);
+		memcpy(req->obj->vary, VSB_data(vary), varyl);
+		VRY_Validate(req->obj->vary);
 		VSB_delete(vary);
 	}
 
-	wrk->obj->xid = req->xid;
-	wrk->obj->response = req->err_code;
-	WS_Assert(wrk->obj->ws_o);
+	req->obj->xid = req->xid;
+	req->obj->response = req->err_code;
+	WS_Assert(req->obj->ws_o);
 
 	/* Filter into object */
 	hp = wrk->busyobj->beresp;
-	hp2 = wrk->obj->http;
+	hp2 = req->obj->http;
 
 	hp2->logtag = HTTP_Obj;
 	http_CopyResp(hp2, hp);
@@ -882,9 +882,9 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	http_CopyHome(wrk, sp->vsl_id, hp2);
 
 	if (http_GetHdr(hp, H_Last_Modified, &b))
-		wrk->obj->last_modified = VTIM_parse(b);
+		req->obj->last_modified = VTIM_parse(b);
 	else
-		wrk->obj->last_modified = floor(wrk->busyobj->exp.entered);
+		req->obj->last_modified = floor(wrk->busyobj->exp.entered);
 
 	assert(WRW_IsReleased(wrk));
 
@@ -893,12 +893,12 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	 * Notice that vcl_deliver{} could still nuke the headers
 	 * that allow the 304, in which case we return 200 non-stream.
 	 */
-	if (wrk->obj->response == 200 &&
+	if (req->obj->response == 200 &&
 	    req->http->conds &&
 	    RFC2616_Do_Cond(sp))
 		wrk->busyobj->do_stream = 0;
 
-	AssertObjCorePassOrBusy(wrk->obj->objcore);
+	AssertObjCorePassOrBusy(req->obj->objcore);
 
 	if (wrk->busyobj->do_stream) {
 		sp->step = STP_PREPRESP;
@@ -906,7 +906,7 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 
 	/* Use unmodified headers*/
-	i = FetchBody(wrk, wrk->obj);
+	i = FetchBody(wrk, req->obj);
 
 	http_Setup(wrk->busyobj->bereq, NULL);
 	http_Setup(wrk->busyobj->beresp, NULL);
@@ -918,16 +918,16 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	if (i) {
 		HSH_Drop(wrk);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
-		AZ(wrk->obj);
+		AZ(req->obj);
 		req->err_code = 503;
 		sp->step = STP_ERROR;
 		return (0);
 	}
 
-	if (wrk->obj->objcore != NULL) {
-		EXP_Insert(wrk->obj);
-		AN(wrk->obj->objcore);
-		AN(wrk->obj->objcore->ban);
+	if (req->obj->objcore != NULL) {
+		EXP_Insert(req->obj);
+		AN(req->obj->objcore);
+		AN(req->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	}
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
@@ -973,9 +973,9 @@ cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 
 	RES_StreamStart(sp);
 
-	AssertObjCorePassOrBusy(wrk->obj->objcore);
+	AssertObjCorePassOrBusy(req->obj->objcore);
 
-	i = FetchBody(wrk, wrk->obj);
+	i = FetchBody(wrk, req->obj);
 
 	http_Setup(wrk->busyobj->bereq, NULL);
 	http_Setup(wrk->busyobj->beresp, NULL);
@@ -983,10 +983,10 @@ cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 	AZ(wrk->busyobj->vbc);
 	AN(req->director);
 
-	if (!i && wrk->obj->objcore != NULL) {
-		EXP_Insert(wrk->obj);
-		AN(wrk->obj->objcore);
-		AN(wrk->obj->objcore->ban);
+	if (!i && req->obj->objcore != NULL) {
+		EXP_Insert(req->obj);
+		AN(req->obj->objcore);
+		AN(req->obj->objcore->ban);
 		HSH_Unbusy(wrk);
 	} else {
 		req->doclose = "Stream error";
@@ -1002,7 +1002,7 @@ cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 	wrk->sctx = NULL;
 	assert(WRW_IsReleased(wrk));
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
-	(void)HSH_Deref(wrk, NULL, &wrk->obj);
+	(void)HSH_Deref(wrk, NULL, &req->obj);
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	http_Setup(req->resp, NULL);
 	sp->step = STP_DONE;
@@ -1075,11 +1075,11 @@ cnt_hit(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	CHECK_OBJ_NOTNULL(wrk->obj, OBJECT_MAGIC);
+	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(wrk->busyobj);
 
-	assert(!(wrk->obj->objcore->flags & OC_F_PASS));
+	assert(!(req->obj->objcore->flags & OC_F_PASS));
 
 	VCL_hit_method(sp);
 
@@ -1093,8 +1093,8 @@ cnt_hit(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 
 	/* Drop our object, we won't need it */
-	(void)HSH_Deref(wrk, NULL, &wrk->obj);
-	wrk->objcore = NULL;
+	(void)HSH_Deref(wrk, NULL, &req->obj);
+	req->objcore = NULL;
 
 	switch(req->handling) {
 	case VCL_RET_PASS:
@@ -1200,7 +1200,7 @@ cnt_lookup(struct sess *sp, struct worker *wrk, struct req *req)
 		req->vary_l = NULL;
 		req->vary_e = NULL;
 
-		wrk->objcore = oc;
+		req->objcore = oc;
 		CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 		sp->step = STP_MISS;
 		return (0);
@@ -1208,7 +1208,7 @@ cnt_lookup(struct sess *sp, struct worker *wrk, struct req *req)
 
 	o = oc_getobj(wrk, oc);
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
-	wrk->obj = o;
+	req->obj = o;
 
 	WS_Release(req->ws, 0);
 	req->vary_b = NULL;
@@ -1217,15 +1217,15 @@ cnt_lookup(struct sess *sp, struct worker *wrk, struct req *req)
 
 	if (oc->flags & OC_F_PASS) {
 		wrk->stats.cache_hitpass++;
-		WSP(sp, SLT_HitPass, "%u", wrk->obj->xid);
-		(void)HSH_Deref(wrk, NULL, &wrk->obj);
-		wrk->objcore = NULL;
+		WSP(sp, SLT_HitPass, "%u", req->obj->xid);
+		(void)HSH_Deref(wrk, NULL, &req->obj);
+		req->objcore = NULL;
 		sp->step = STP_PASS;
 		return (0);
 	}
 
 	wrk->stats.cache_hit++;
-	WSP(sp, SLT_Hit, "%u", wrk->obj->xid);
+	WSP(sp, SLT_Hit, "%u", req->obj->xid);
 	sp->step = STP_HIT;
 	return (0);
 }
@@ -1262,8 +1262,8 @@ cnt_miss(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 
-	AZ(wrk->obj);
-	AN(wrk->objcore);
+	AZ(req->obj);
+	AN(req->objcore);
 	CHECK_OBJ_NOTNULL(wrk->busyobj, BUSYOBJ_MAGIC);
 	WS_Reset(wrk->ws, NULL);
 	wrk->busyobj = VBO_GetBusyObj(wrk);
@@ -1288,15 +1288,15 @@ cnt_miss(struct sess *sp, struct worker *wrk, struct req *req)
 
 	switch(req->handling) {
 	case VCL_RET_ERROR:
-		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
-		wrk->objcore = NULL;
+		AZ(HSH_Deref(wrk, req->objcore, NULL));
+		req->objcore = NULL;
 		http_Setup(wrk->busyobj->bereq, NULL);
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_ERROR;
 		return (0);
 	case VCL_RET_PASS:
-		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
-		wrk->objcore = NULL;
+		AZ(HSH_Deref(wrk, req->objcore, NULL));
+		req->objcore = NULL;
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		sp->step = STP_PASS;
 		return (0);
@@ -1305,8 +1305,8 @@ cnt_miss(struct sess *sp, struct worker *wrk, struct req *req)
 		sp->step = STP_FETCH;
 		return (0);
 	case VCL_RET_RESTART:
-		AZ(HSH_Deref(wrk, wrk->objcore, NULL));
-		wrk->objcore = NULL;
+		AZ(HSH_Deref(wrk, req->objcore, NULL));
+		req->objcore = NULL;
 		VBO_DerefBusyObj(wrk, &wrk->busyobj);
 		INCOMPL();
 	default:
@@ -1353,7 +1353,7 @@ cnt_pass(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
-	AZ(wrk->obj);
+	AZ(req->obj);
 	AZ(wrk->busyobj);
 
 	wrk->busyobj = VBO_GetBusyObj(wrk);
@@ -1464,7 +1464,7 @@ cnt_recv(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
-	AZ(wrk->obj);
+	AZ(req->obj);
 	AZ(wrk->busyobj);
 	assert(wrk->wrw.ciov == wrk->wrw.siov);
 
@@ -1562,7 +1562,7 @@ cnt_start(struct sess *sp, struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AZ(req->restarts);
-	AZ(wrk->obj);
+	AZ(req->obj);
 	AZ(req->vcl);
 	EXP_Clr(&req->exp);
 	AZ(req->esi_level);
@@ -1641,20 +1641,24 @@ static void
 cnt_diag(struct sess *sp, const char *state)
 {
 	void *vcl;
+	void *obj;
 
-	if (sp->req == NULL)
+	if (sp->req == NULL) {
 		vcl = NULL;
-	else
+		obj = NULL;
+	} else {
 		vcl = sp->req->vcl;
+		obj = sp->req->obj;
+	}
 
 	if (sp->wrk != NULL) {
 		WSP(sp, SLT_Debug, "thr %p STP_%s sp %p obj %p vcl %p",
-		    pthread_self(), state, sp, sp->wrk->obj, vcl);
+		    pthread_self(), state, sp, obj, vcl);
 		WSL_Flush(sp->wrk, 0);
 	} else {
 		VSL(SLT_Debug, sp->vsl_id,
 		    "thr %p STP_%s sp %p obj %p vcl %p",
-		    pthread_self(), state, sp, sp->wrk->obj, vcl);
+		    pthread_self(), state, sp, obj, vcl);
 	}
 }
 
@@ -1681,9 +1685,6 @@ CNT_Session(struct sess *sp)
 	    sp->step == STP_LOOKUP ||
 	    sp->step == STP_RECV);
 
-	AZ(wrk->obj);
-	AZ(wrk->objcore);
-
 	/*
 	 * Whenever we come in from the acceptor or waiter, we need to set
 	 * blocking mode, but there is no point in setting it when we come from
@@ -1716,7 +1717,6 @@ CNT_Session(struct sess *sp)
 		 */
 		CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 		CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-		CHECK_OBJ_ORNULL(wrk->obj, OBJECT_MAGIC);
 		CHECK_OBJ_ORNULL(wrk->nobjhead, OBJHEAD_MAGIC);
 		WS_Assert(wrk->ws);
 
@@ -1736,8 +1736,6 @@ CNT_Session(struct sess *sp)
 		CHECK_OBJ_ORNULL(wrk->nobjhead, OBJHEAD_MAGIC);
 	}
 	WSL_Flush(wrk, 0);
-	AZ(wrk->obj);
-	AZ(wrk->objcore);
 #define ACCT(foo)	AZ(wrk->acct_tmp.foo);
 #include "tbl/acct_fields.h"
 #undef ACCT
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index be8d185..0c58395 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -58,8 +58,8 @@ ved_include(struct sess *sp, const char *src, const char *host)
 
 	(void)WRW_FlushRelease(w);
 
-	obj = sp->wrk->obj;
-	sp->wrk->obj = NULL;
+	obj = sp->req->obj;
+	sp->req->obj = NULL;
 	res_mode = sp->wrk->res_mode;
 
 	/* Reset request to status before we started messing with it */
@@ -106,7 +106,7 @@ ved_include(struct sess *sp, const char *src, const char *host)
 	AN(sp->wrk);
 	assert(sp->step == STP_DONE);
 	sp->req->esi_level--;
-	sp->wrk->obj = obj;
+	sp->req->obj = obj;
 	sp->wrk->res_mode = res_mode;
 
 	/* Reset the workspace */
@@ -231,7 +231,7 @@ ESI_Deliver(struct sess *sp)
 	int i;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	st = sp->wrk->obj->esidata;
+	st = sp->req->obj->esidata;
 	AN(st);
 	assert(sizeof obuf >= 1024);
 
@@ -276,7 +276,7 @@ ESI_Deliver(struct sess *sp)
 		obufl = 0;
 	}
 
-	st = VTAILQ_FIRST(&sp->wrk->obj->store);
+	st = VTAILQ_FIRST(&sp->req->obj->store);
 	off = 0;
 
 	while (p < e) {
@@ -435,7 +435,7 @@ ved_deliver_byterange(const struct sess *sp, ssize_t low, ssize_t high)
 
 //printf("BR %jd %jd\n", low, high);
 	lx = 0;
-	VTAILQ_FOREACH(st, &sp->wrk->obj->store, list) {
+	VTAILQ_FOREACH(st, &sp->req->obj->store, list) {
 		p = st->ptr;
 		l = st->len;
 //printf("[0-] %jd %jd\n", lx, lx + l);
@@ -476,8 +476,8 @@ ESI_DeliverChild(const struct sess *sp)
 	uint32_t ilen;
 	uint8_t *dbits;
 
-	if (!sp->wrk->obj->gziped) {
-		VTAILQ_FOREACH(st, &sp->wrk->obj->store, list)
+	if (!sp->req->obj->gziped) {
+		VTAILQ_FOREACH(st, &sp->req->obj->store, list)
 			ved_pretend_gzip(sp, st->ptr, st->len);
 		return;
 	}
@@ -489,7 +489,7 @@ ESI_DeliverChild(const struct sess *sp)
 
 	dbits = (void*)WS_Alloc(sp->wrk->ws, 8);
 	AN(dbits);
-	obj = sp->wrk->obj;
+	obj = sp->req->obj;
 	CHECK_OBJ_NOTNULL(obj, OBJECT_MAGIC);
 	start = obj->gzip_start;
 	last = obj->gzip_last;
@@ -554,7 +554,7 @@ ESI_DeliverChild(const struct sess *sp)
 	}
 	if (lpad > 0)
 		(void)WRW_Write(sp->wrk, dbits + 1, lpad);
-	st = VTAILQ_LAST(&sp->wrk->obj->store, storagehead);
+	st = VTAILQ_LAST(&sp->req->obj->store, storagehead);
 	assert(st->len > 8);
 
 	p = st->ptr + st->len - 8;
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 2e65591..7070612 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -391,11 +391,11 @@ FetchHdr(struct sess *sp, int need_host_hdr)
 	htc = &wrk->busyobj->htc;
 
 	AN(sp->req->director);
-	AZ(sp->wrk->obj);
+	AZ(sp->req->obj);
 
-	if (sp->wrk->objcore != NULL) {		/* pass has no objcore */
-		CHECK_OBJ_NOTNULL(sp->wrk->objcore, OBJCORE_MAGIC);
-		AN(sp->wrk->objcore->flags & OC_F_BUSY);
+	if (sp->req->objcore != NULL) {		/* pass has no objcore */
+		CHECK_OBJ_NOTNULL(sp->req->objcore, OBJCORE_MAGIC);
+		AN(sp->req->objcore->flags & OC_F_BUSY);
 	}
 
 	hp = wrk->busyobj->bereq;
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 061348a..1b732ca 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -248,7 +248,7 @@ VGZ_ObufFull(const struct vgz *vg)
 
 /*--------------------------------------------------------------------
  * Keep the outbuffer supplied with storage and file it under the
- * sp->wrk->obj as it fills.
+ * sp->req->obj as it fills.
  */
 
 int
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 9f2c053..19395d5 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -389,8 +389,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 	 * XXX: serialize fetch of all Vary's if grace is possible.
 	 */
 
-	AZ(sp->wrk->objcore);
-	sp->wrk->objcore = grace_oc;		/* XXX: Hack-ish */
+	AZ(sp->req->objcore);
+	sp->req->objcore = grace_oc;		/* XXX: Hack-ish */
 	if (oc == NULL			/* We found no live object */
 	    && grace_oc != NULL		/* There is a grace candidate */
 	    && (busy_oc != NULL		/* Somebody else is already busy */
@@ -400,7 +400,7 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 		oc = grace_oc;
 	}
-	sp->wrk->objcore = NULL;
+	sp->req->objcore = NULL;
 
 	if (oc != NULL && !sp->req->hash_always_miss) {
 		o = oc_getobj(sp->wrk, oc);
@@ -580,13 +580,13 @@ HSH_Drop(struct worker *wrk)
 	struct object *o;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	o = wrk->obj;
+	o = wrk->sp->req->obj;
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	AssertObjCorePassOrBusy(o->objcore);
 	o->exp.ttl = -1.;
 	if (o->objcore != NULL)		/* Pass has no objcore */
 		HSH_Unbusy(wrk);
-	(void)HSH_Deref(wrk, NULL, &wrk->obj);
+	(void)HSH_Deref(wrk, NULL, &wrk->sp->req->obj);
 }
 
 void
@@ -597,7 +597,7 @@ HSH_Unbusy(struct worker *wrk)
 	struct objcore *oc;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	o = wrk->obj;
+	o = wrk->sp->req->obj;
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	oc = o->objcore;
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 80f61a4..b09bcb8 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -274,8 +274,8 @@ pan_sess(const struct sess *sp)
 	if (VALID_OBJ(sp->req->vcl, VCL_CONF_MAGIC))
 		pan_vcl(sp->req->vcl);
 
-	if (VALID_OBJ(sp->wrk->obj, OBJECT_MAGIC))
-		pan_object(sp->wrk->obj);
+	if (VALID_OBJ(sp->req->obj, OBJECT_MAGIC))
+		pan_object(sp->req->obj);
 
 	VSB_printf(pan_vsp, "},\n");
 }
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 5c10c35..1abb12b 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -41,7 +41,7 @@ res_dorange(const struct sess *sp, const char *r, ssize_t *plow, ssize_t *phigh)
 {
 	ssize_t low, high, has_low;
 
-	assert(sp->wrk->obj->response == 200);
+	assert(sp->req->obj->response == 200);
 	if (strncmp(r, "bytes=", 6))
 		return;
 	r += 6;
@@ -57,7 +57,7 @@ res_dorange(const struct sess *sp, const char *r, ssize_t *plow, ssize_t *phigh)
 		r++;
 	}
 
-	if (low >= sp->wrk->obj->len)
+	if (low >= sp->req->obj->len)
 		return;
 
 	if (*r != '-')
@@ -73,23 +73,23 @@ res_dorange(const struct sess *sp, const char *r, ssize_t *plow, ssize_t *phigh)
 			r++;
 		}
 		if (!has_low) {
-			low = sp->wrk->obj->len - high;
-			high = sp->wrk->obj->len - 1;
+			low = sp->req->obj->len - high;
+			high = sp->req->obj->len - 1;
 		}
 	} else
-		high = sp->wrk->obj->len - 1;
+		high = sp->req->obj->len - 1;
 	if (*r != '\0')
 		return;
 
-	if (high >= sp->wrk->obj->len)
-		high = sp->wrk->obj->len - 1;
+	if (high >= sp->req->obj->len)
+		high = sp->req->obj->len - 1;
 
 	if (low > high)
 		return;
 
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 	    "Content-Range: bytes %jd-%jd/%jd",
-	    (intmax_t)low, (intmax_t)high, (intmax_t)sp->wrk->obj->len);
+	    (intmax_t)low, (intmax_t)high, (intmax_t)sp->req->obj->len);
 	http_Unset(sp->req->resp, H_Content_Length);
 	assert(sp->wrk->res_mode & RES_LEN);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
@@ -112,9 +112,9 @@ RES_BuildHttp(const struct sess *sp)
 
 	http_ClrHeader(sp->req->resp);
 	sp->req->resp->logtag = HTTP_Tx;
-	http_CopyResp(sp->req->resp, sp->wrk->obj->http);
+	http_CopyResp(sp->req->resp, sp->req->obj->http);
 	http_FilterFields(sp->wrk, sp->vsl_id, sp->req->resp,
-	    sp->wrk->obj->http, HTTPH_A_DELIVER);
+	    sp->req->obj->http, HTTPH_A_DELIVER);
 
 	if (!(sp->wrk->res_mode & RES_LEN)) {
 		http_Unset(sp->req->resp, H_Content_Length);
@@ -132,15 +132,15 @@ RES_BuildHttp(const struct sess *sp)
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 	    "Date: %s", time_str);
 
-	if (sp->req->xid != sp->wrk->obj->xid)
+	if (sp->req->xid != sp->req->obj->xid)
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
-		    "X-Varnish: %u %u", sp->req->xid, sp->wrk->obj->xid);
+		    "X-Varnish: %u %u", sp->req->xid, sp->req->obj->xid);
 	else
 		http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp,
 		    "X-Varnish: %u", sp->req->xid);
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Age: %.0f",
-	    sp->wrk->obj->exp.age + sp->req->t_resp -
-	    sp->wrk->obj->exp.entered);
+	    sp->req->obj->exp.age + sp->req->t_resp -
+	    sp->req->obj->exp.entered);
 	http_SetHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Via: 1.1 varnish");
 	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->resp, "Connection: %s",
 	    sp->req->doclose ? "close" : "keep-alive");
@@ -167,7 +167,7 @@ res_WriteGunzipObj(const struct sess *sp)
 	vg = VGZ_NewUngzip(sp->wrk, "U D -");
 
 	VGZ_Obuf(vg, obuf, sizeof obuf);
-	VTAILQ_FOREACH(st, &sp->wrk->obj->store, list) {
+	VTAILQ_FOREACH(st, &sp->req->obj->store, list) {
 		CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 		CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC);
 		u += st->len;
@@ -185,7 +185,7 @@ res_WriteGunzipObj(const struct sess *sp)
 		(void)WRW_Flush(sp->wrk);
 	}
 	(void)VGZ_Destroy(&vg, sp->vsl_id);
-	assert(u == sp->wrk->obj->len);
+	assert(u == sp->req->obj->len);
 }
 
 /*--------------------------------------------------------------------*/
@@ -200,7 +200,7 @@ res_WriteDirObj(const struct sess *sp, ssize_t low, ssize_t high)
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
 	ptr = 0;
-	VTAILQ_FOREACH(st, &sp->wrk->obj->store, list) {
+	VTAILQ_FOREACH(st, &sp->req->obj->store, list) {
 		CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 		CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC);
 		u += st->len;
@@ -241,7 +241,7 @@ res_WriteDirObj(const struct sess *sp, ssize_t low, ssize_t high)
 		VSC_C_main->n_objwrite++;
 		(void)WRW_Write(sp->wrk, st->ptr + off, len);
 	}
-	assert(u == sp->wrk->obj->len);
+	assert(u == sp->req->obj->len);
 }
 
 /*--------------------------------------------------------------------
@@ -259,7 +259,7 @@ RES_WriteObj(struct sess *sp)
 
 	WRW_Reserve(sp->wrk, &sp->fd);
 
-	if (sp->wrk->obj->response == 200 &&
+	if (sp->req->obj->response == 200 &&
 	    sp->req->http->conds &&
 	    RFC2616_Do_Cond(sp)) {
 		sp->req->wantbody = 0;
@@ -272,13 +272,13 @@ RES_WriteObj(struct sess *sp)
 	 * If nothing special planned, we can attempt Range support
 	 */
 	low = 0;
-	high = sp->wrk->obj->len - 1;
+	high = sp->req->obj->len - 1;
 	if (
 	    sp->req->wantbody &&
 	    (sp->wrk->res_mode & RES_LEN) &&
 	    !(sp->wrk->res_mode & (RES_ESI|RES_ESI_CHILD|RES_GUNZIP)) &&
 	    cache_param->http_range_support &&
-	    sp->wrk->obj->response == 200 &&
+	    sp->req->obj->response == 200 &&
 	    http_GetHdr(sp->req->http, H_Range, &r))
 		res_dorange(sp, r, &low, &high);
 
@@ -303,14 +303,14 @@ RES_WriteObj(struct sess *sp)
 
 	if (!sp->req->wantbody) {
 		/* This was a HEAD or conditional request */
-	} else if (sp->wrk->obj->len == 0) {
+	} else if (sp->req->obj->len == 0) {
 		/* Nothing to do here */
 	} else if (sp->wrk->res_mode & RES_ESI) {
 		ESI_Deliver(sp);
 	} else if (sp->wrk->res_mode & RES_ESI_CHILD && sp->wrk->gzip_resp) {
 		ESI_DeliverChild(sp);
 	} else if (sp->wrk->res_mode & RES_ESI_CHILD &&
-	    !sp->wrk->gzip_resp && sp->wrk->obj->gziped) {
+	    !sp->wrk->gzip_resp && sp->req->obj->gziped) {
 		res_WriteGunzipObj(sp);
 	} else if (sp->wrk->res_mode & RES_GUNZIP) {
 		res_WriteGunzipObj(sp);
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 04641ca..1b67d81 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -319,18 +319,18 @@ RFC2616_Do_Cond(const struct sess *sp)
 	   and If-Modified-Since if present*/
 
 	if (http_GetHdr(sp->req->http, H_If_Modified_Since, &p) ) {
-		if (!sp->wrk->obj->last_modified)
+		if (!sp->req->obj->last_modified)
 			return (0);
 		ims = VTIM_parse(p);
 		if (ims > sp->t_req)	/* [RFC2616 14.25] */
 			return (0);
-		if (sp->wrk->obj->last_modified > ims)
+		if (sp->req->obj->last_modified > ims)
 			return (0);
 		do_cond = 1;
 	}
 
 	if (http_GetHdr(sp->req->http, H_If_None_Match, &p) &&
-	    http_GetHdr(sp->wrk->obj->http, H_ETag, &e)) {
+	    http_GetHdr(sp->req->obj->http, H_ETag, &e)) {
 		if (strcmp(p,e) != 0)
 			return (0);
 		do_cond = 1;
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 67875bd..2623bcc 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -110,8 +110,8 @@ vrt_selecthttp(const struct sess *sp, enum gethdr_e where)
 		hp = sp->req->resp;
 		break;
 	case HDR_OBJ:
-		CHECK_OBJ_NOTNULL(sp->wrk->obj, OBJECT_MAGIC);
-		hp = sp->wrk->obj->http;
+		CHECK_OBJ_NOTNULL(sp->req->obj, OBJECT_MAGIC);
+		hp = sp->req->obj->http;
 		break;
 	default:
 		INCOMPL();
@@ -401,8 +401,8 @@ VRT_synth_page(const struct sess *sp, unsigned flags, const char *str, ...)
 
 	(void)flags;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->obj, OBJECT_MAGIC);
-	vsb = SMS_Makesynth(sp->wrk->obj);
+	CHECK_OBJ_NOTNULL(sp->req->obj, OBJECT_MAGIC);
+	vsb = SMS_Makesynth(sp->req->obj);
 	AN(vsb);
 
 	VSB_cat(vsb, str);
@@ -415,10 +415,10 @@ VRT_synth_page(const struct sess *sp, unsigned flags, const char *str, ...)
 		p = va_arg(ap, const char *);
 	}
 	va_end(ap);
-	SMS_Finish(sp->wrk->obj);
-	http_Unset(sp->wrk->obj->http, H_Content_Length);
-	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->obj->http,
-	    "Content-Length: %zd", sp->wrk->obj->len);
+	SMS_Finish(sp->req->obj);
+	http_Unset(sp->req->obj->http, H_Content_Length);
+	http_PrintfHeader(sp->wrk, sp->vsl_id, sp->req->obj->http,
+	    "Content-Length: %zd", sp->req->obj->len);
 }
 
 /*--------------------------------------------------------------------*/
@@ -512,9 +512,9 @@ void
 VRT_purge(const struct sess *sp, double ttl, double grace)
 {
 	if (sp->req->cur_method == VCL_MET_HIT)
-		HSH_Purge(sp, sp->wrk->obj->objcore->objhead, ttl, grace);
+		HSH_Purge(sp, sp->req->obj->objcore->objhead, ttl, grace);
 	else if (sp->req->cur_method == VCL_MET_MISS)
-		HSH_Purge(sp, sp->wrk->objcore->objhead, ttl, grace);
+		HSH_Purge(sp, sp->req->objcore->objhead, ttl, grace);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 6e5c751..cb66ff7 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -88,8 +88,8 @@ VRT_DO_HDR(req,   proto,	sp->req->http,		HTTP_HDR_PROTO)
 VRT_DO_HDR(bereq, request,	sp->wrk->busyobj->bereq,	HTTP_HDR_REQ)
 VRT_DO_HDR(bereq, url,		sp->wrk->busyobj->bereq,	HTTP_HDR_URL)
 VRT_DO_HDR(bereq, proto,	sp->wrk->busyobj->bereq,	HTTP_HDR_PROTO)
-VRT_DO_HDR(obj,   proto,	sp->wrk->obj->http,	HTTP_HDR_PROTO)
-VRT_DO_HDR(obj,   response,	sp->wrk->obj->http,	HTTP_HDR_RESPONSE)
+VRT_DO_HDR(obj,   proto,	sp->req->obj->http,	HTTP_HDR_PROTO)
+VRT_DO_HDR(obj,   response,	sp->req->obj->http,	HTTP_HDR_RESPONSE)
 VRT_DO_HDR(resp,  proto,	sp->req->resp,		HTTP_HDR_PROTO)
 VRT_DO_HDR(resp,  response,	sp->req->resp,		HTTP_HDR_RESPONSE)
 VRT_DO_HDR(beresp,  proto,	sp->wrk->busyobj->beresp,	HTTP_HDR_PROTO)
@@ -114,7 +114,7 @@ VRT_r_##obj##_status(const struct sess *sp)			\
 	return(http->status);					\
 }
 
-VRT_DO_STATUS(obj, sp->wrk->obj->http)
+VRT_DO_STATUS(obj, sp->req->obj->http)
 VRT_DO_STATUS(beresp, sp->wrk->busyobj->beresp)
 VRT_DO_STATUS(resp, sp->req->resp)
 
@@ -145,9 +145,9 @@ VRT_l_beresp_saintmode(const struct sess *sp, double a)
 	if (!vbc->backend)
 		return;
 	CHECK_OBJ_NOTNULL(vbc->backend, BACKEND_MAGIC);
-	if (!sp->wrk->objcore)
+	if (!sp->req->objcore)
 		return;
-	CHECK_OBJ_NOTNULL(sp->wrk->objcore, OBJCORE_MAGIC);
+	CHECK_OBJ_NOTNULL(sp->req->objcore, OBJCORE_MAGIC);
 
 	/* Setting a negative holdoff period is a mistake. Detecting this
 	 * when compiling the VCL would be better.
@@ -156,7 +156,7 @@ VRT_l_beresp_saintmode(const struct sess *sp, double a)
 
 	ALLOC_OBJ(new, TROUBLE_MAGIC);
 	AN(new);
-	new->target = (uintptr_t)(sp->wrk->objcore->objhead);
+	new->target = (uintptr_t)(sp->req->objcore->objhead);
 	new->timeout = sp->t_req + a;
 
 	/* Insert the new item on the list before the first item with a
@@ -405,15 +405,15 @@ VRT_DO_EXP(req, sp->req->exp, ttl, 0, )
 VRT_DO_EXP(req, sp->req->exp, grace, 0, )
 VRT_DO_EXP(req, sp->req->exp, keep, 0, )
 
-VRT_DO_EXP(obj, sp->wrk->obj->exp, grace, 0,
-   EXP_Rearm(sp->wrk->obj);
-   vrt_wsp_exp(sp, sp->wrk->obj->xid, &sp->wrk->obj->exp);)
-VRT_DO_EXP(obj, sp->wrk->obj->exp, ttl, (sp->t_req - sp->wrk->obj->exp.entered),
-   EXP_Rearm(sp->wrk->obj);
-   vrt_wsp_exp(sp, sp->wrk->obj->xid, &sp->wrk->obj->exp);)
-VRT_DO_EXP(obj, sp->wrk->obj->exp, keep, 0,
-   EXP_Rearm(sp->wrk->obj);
-   vrt_wsp_exp(sp, sp->wrk->obj->xid, &sp->wrk->obj->exp);)
+VRT_DO_EXP(obj, sp->req->obj->exp, grace, 0,
+   EXP_Rearm(sp->req->obj);
+   vrt_wsp_exp(sp, sp->req->obj->xid, &sp->req->obj->exp);)
+VRT_DO_EXP(obj, sp->req->obj->exp, ttl, (sp->t_req - sp->req->obj->exp.entered),
+   EXP_Rearm(sp->req->obj);
+   vrt_wsp_exp(sp, sp->req->obj->xid, &sp->req->obj->exp);)
+VRT_DO_EXP(obj, sp->req->obj->exp, keep, 0,
+   EXP_Rearm(sp->req->obj);
+   vrt_wsp_exp(sp, sp->req->obj->xid, &sp->req->obj->exp);)
 
 VRT_DO_EXP(beresp, sp->wrk->busyobj->exp, grace, 0,
    vrt_wsp_exp(sp, sp->req->xid, &sp->wrk->busyobj->exp);)
@@ -531,8 +531,8 @@ VRT_r_obj_hits(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->obj, OBJECT_MAGIC);	/* XXX */
-	return (sp->wrk->obj->hits);
+	CHECK_OBJ_NOTNULL(sp->req->obj, OBJECT_MAGIC);	/* XXX */
+	return (sp->req->obj->hits);
 }
 
 double
@@ -540,8 +540,8 @@ VRT_r_obj_lastuse(const struct sess *sp)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->wrk->obj, OBJECT_MAGIC);	/* XXX */
-	return (VTIM_real() - sp->wrk->obj->last_use);
+	CHECK_OBJ_NOTNULL(sp->req->obj, OBJECT_MAGIC);	/* XXX */
+	return (VTIM_real() - sp->req->obj->last_use);
 }
 
 unsigned
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index a6156d4..ccd45b1 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -256,11 +256,11 @@ STV_MkObject(struct worker *wrk, void *ptr, unsigned ltot,
 	VTAILQ_INIT(&o->store);
 	wrk->stats.n_object++;
 
-	if (wrk->objcore != NULL) {
-		CHECK_OBJ_NOTNULL(wrk->objcore, OBJCORE_MAGIC);
+	if (wrk->sp->req->objcore != NULL) {
+		CHECK_OBJ_NOTNULL(wrk->sp->req->objcore, OBJCORE_MAGIC);
 
-		o->objcore = wrk->objcore;
-		wrk->objcore = NULL;     /* refcnt follows pointer. */
+		o->objcore = wrk->sp->req->objcore;
+		wrk->sp->req->objcore = NULL;     /* refcnt follows pointer. */
 		BAN_NewObjCore(o->objcore);
 
 		o->objcore->methods = &default_oc_methods;
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 0791941..f90594e 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -474,10 +474,10 @@ smp_allocobj(struct stevedore *stv, struct worker *wrk, unsigned ltot,
 	struct objcore *oc;
 	unsigned objidx;
 
-	if (wrk->objcore == NULL)
+	if (wrk->sp->req->objcore == NULL)
 		return (NULL);		/* from cnt_error */
 	CAST_OBJ_NOTNULL(sc, stv->priv, SMP_SC_MAGIC);
-	AN(wrk->objcore);
+	AN(wrk->sp->req->objcore);
 	AN(wrk->busyobj->exp.ttl > 0.);
 
 	ltot = IRNUP(sc, ltot);



From phk at varnish-cache.org  Mon Dec 26 10:22:10 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 11:22:10 +0100
Subject: [master] 624b373 Move sha256 hash context from worker to req
Message-ID: <E1Rf7h4-0004Po-In@project.varnish-software.com>

commit 624b3731b13b23fbd60499170dfb2458ef111b6e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 10:12:24 2011 +0000

    Move sha256 hash context from worker to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 71b2c83..372a32d 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -324,9 +324,6 @@ struct worker {
 	uint32_t		*wlb, *wlp, *wle;
 	unsigned		wlr;
 
-	/* Lookup stuff */
-	struct SHA256Context	*sha256ctx;
-
 	struct ws		ws[1];
 
 	struct busyobj		*busyobj;
@@ -622,6 +619,9 @@ struct req {
 	struct ws		ws[1];
 	struct object		*obj;
 	struct objcore		*objcore;
+	/* Lookup stuff */
+	struct SHA256Context	*sha256ctx;
+
 };
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 8ee4470..7e9c77f 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1502,10 +1502,10 @@ cnt_recv(struct sess *sp, struct worker *wrk, struct req *req)
 		}
 	}
 
-	SHA256_Init(wrk->sha256ctx);
+	SHA256_Init(req->sha256ctx);
 	VCL_hash_method(sp);
 	assert(req->handling == VCL_RET_HASH);
-	SHA256_Final(req->digest, wrk->sha256ctx);
+	SHA256_Final(req->digest, req->sha256ctx);
 
 	if (!strcmp(req->http->hd[HTTP_HDR_REQ].b, "HEAD"))
 		req->wantbody = 0;
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 19395d5..643eb94 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -158,8 +158,8 @@ HSH_AddString(const struct sess *sp, const char *str)
 		str = "";
 	l = strlen(str);
 
-	SHA256_Update(sp->wrk->sha256ctx, str, l);
-	SHA256_Update(sp->wrk->sha256ctx, "#", 1);
+	SHA256_Update(sp->req->sha256ctx, str, l);
+	SHA256_Update(sp->req->sha256ctx, "#", 1);
 
 	if (cache_param->log_hash)
 		WSP(sp, SLT_Hash, "%s", str);
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index ee5060f..d26bd8f 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -42,6 +42,7 @@
 #include "cache.h"
 
 #include "waiter/waiter.h"
+#include "vsha256.h"
 #include "vtim.h"
 
 static unsigned ses_size = sizeof (struct sess);
@@ -270,7 +271,10 @@ SES_GetReq(struct sess *sp)
 	nhttp = (uint16_t)cache_param->http_max_hdr;
 	hl = HTTP_estimate(nhttp);
 
-	xxxassert(sz > 3 * hl + 128);
+	xxxassert(sz > 3 * hl + sizeof(struct SHA256Context) + 128);
+
+	sp->req->sha256ctx = (void*)p;
+	p += sizeof(struct SHA256Context);
 
 	sp->req->http = HTTP_create(p, nhttp);
 	p += hl;		// XXX: align ?
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 2e933c5..6087991 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -37,7 +37,6 @@
 #include "cache.h"
 
 #include "hash/hash_slinger.h"
-#include "vsha256.h"
 
 static struct lock		wstat_mtx;
 
@@ -140,7 +139,6 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	/* XXX: can we trust these to be properly aligned ? */
 	unsigned char ws[sess_workspace];
 	struct iovec iov[siov];
-	struct SHA256Context sha256;
 
 	THR_SetName("cache-worker");
 	w = &ww;
@@ -149,7 +147,6 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	w->lastused = NAN;
 	w->wlb = w->wlp = wlog;
 	w->wle = wlog + (sizeof wlog) / 4;
-	w->sha256ctx = &sha256;
 	w->wrw.iov = iov;
 	w->wrw.siov = siov;
 	w->wrw.ciov = siov;



From phk at varnish-cache.org  Mon Dec 26 10:22:10 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 11:22:10 +0100
Subject: [master] f5577b7 Move more stuff from worker to req
Message-ID: <E1Rf7h4-0004Pt-LF@project.varnish-software.com>

commit f5577b72696ea7035c732293bd60fc0a5794932c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 10:22:01 2011 +0000

    Move more stuff from worker to req

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 372a32d..42562b5 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -328,17 +328,9 @@ struct worker {
 
 	struct busyobj		*busyobj;
 
-	/* This is only here so VRT can find it */
-	const char		*storage_hint;
-
 	/* Stream state */
 	struct stream_ctx	*sctx;
 
-	/* ESI delivery stuff */
-	int			gzip_resp;
-	ssize_t			l_crc;
-	uint32_t		crc;
-
 	/* Timeouts */
 	double			connect_timeout;
 	double			first_byte_timeout;
@@ -621,6 +613,14 @@ struct req {
 	struct objcore		*objcore;
 	/* Lookup stuff */
 	struct SHA256Context	*sha256ctx;
+	/* This is only here so VRT can find it */
+	const char		*storage_hint;
+
+	/* ESI delivery stuff */
+	int			gzip_resp;
+	ssize_t			l_crc;
+	uint32_t		crc;
+
 
 };
 
diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 7e9c77f..81a0c67 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -597,7 +597,7 @@ cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 	AN(req->director);
 	AZ(wrk->busyobj->vbc);
 	AZ(wrk->busyobj->should_close);
-	AZ(wrk->storage_hint);
+	AZ(req->storage_hint);
 
 	http_Setup(wrk->busyobj->beresp, wrk->ws);
 
@@ -678,7 +678,7 @@ cnt_fetch(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 	VBO_DerefBusyObj(wrk, &wrk->busyobj);
 	req->director = NULL;
-	wrk->storage_hint = NULL;
+	req->storage_hint = NULL;
 
 	switch (req->handling) {
 	case VCL_RET_RESTART:
@@ -830,9 +830,9 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 
 	if (wrk->busyobj->exp.ttl < cache_param->shortlived ||
 	    req->objcore == NULL)
-		wrk->storage_hint = TRANSIENT_STORAGE;
+		req->storage_hint = TRANSIENT_STORAGE;
 
-	req->obj = STV_NewObject(wrk, wrk->storage_hint, l, nhttp);
+	req->obj = STV_NewObject(wrk, req->storage_hint, l, nhttp);
 	if (req->obj == NULL) {
 		/*
 		 * Try to salvage the transaction by allocating a
@@ -853,7 +853,7 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
 	}
 	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
 
-	wrk->storage_hint = NULL;
+	req->storage_hint = NULL;
 
 	if (wrk->busyobj->do_gzip ||
 	    (wrk->busyobj->is_gzip && !wrk->busyobj->do_gunzip))
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 0c58395..a7e80cd 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -194,8 +194,8 @@ ved_pretend_gzip(const struct sess *sp, const uint8_t *p, ssize_t l)
 			(void)WRW_Write(sp->wrk, buf2, sizeof buf2);
 		}
 		(void)WRW_Write(sp->wrk, p, lx);
-		sp->wrk->crc = crc32(sp->wrk->crc, p, lx);
-		sp->wrk->l_crc += lx;
+		sp->req->crc = crc32(sp->req->crc, p, lx);
+		sp->req->l_crc += lx;
 		l -= lx;
 		p += lx;
 	}
@@ -251,18 +251,18 @@ ESI_Deliver(struct sess *sp)
 		/*
 		 * Only the top level document gets to decide this.
 		 */
-		sp->wrk->gzip_resp = 0;
+		sp->req->gzip_resp = 0;
 		if (isgzip && !(sp->wrk->res_mode & RES_GUNZIP)) {
 			assert(sizeof gzip_hdr == 10);
 			/* Send out the gzip header */
 			(void)WRW_Write(sp->wrk, gzip_hdr, 10);
-			sp->wrk->l_crc = 0;
-			sp->wrk->gzip_resp = 1;
-			sp->wrk->crc = crc32(0L, Z_NULL, 0);
+			sp->req->l_crc = 0;
+			sp->req->gzip_resp = 1;
+			sp->req->crc = crc32(0L, Z_NULL, 0);
 		}
 	}
 
-	if (isgzip && !sp->wrk->gzip_resp) {
+	if (isgzip && !sp->req->gzip_resp) {
 		vgz = VGZ_NewUngzip(sp->wrk, "U D E");
 
 		/* Feed a gzip header to gunzip to make it happy */
@@ -291,10 +291,10 @@ ESI_Deliver(struct sess *sp)
 				l_icrc = ved_decode_len(&p);
 				icrc = vbe32dec(p);
 				p += 4;
-				if (sp->wrk->gzip_resp) {
-					sp->wrk->crc = crc32_combine(
-					    sp->wrk->crc, icrc, l_icrc);
-					sp->wrk->l_crc += l_icrc;
+				if (sp->req->gzip_resp) {
+					sp->req->crc = crc32_combine(
+					    sp->req->crc, icrc, l_icrc);
+					sp->req->l_crc += l_icrc;
 				}
 			}
 			/*
@@ -308,14 +308,14 @@ ESI_Deliver(struct sess *sp)
 					l2 = st->len - off;
 				l -= l2;
 
-				if (sp->wrk->gzip_resp && isgzip) {
+				if (sp->req->gzip_resp && isgzip) {
 					/*
 					 * We have a gzip'ed VEC and delivers
 					 * a gzip'ed ESI response.
 					 */
 					(void)WRW_Write(sp->wrk,
 					    st->ptr + off, l2);
-				} else if (sp->wrk->gzip_resp) {
+				} else if (sp->req->gzip_resp) {
 					/*
 					 * A gzip'ed ESI response, but the VEC
 					 * was not gzip'ed.
@@ -403,7 +403,7 @@ ESI_Deliver(struct sess *sp)
 			(void)WRW_Write(sp->wrk, obuf, obufl);
 		(void)VGZ_Destroy(&vgz, sp->vsl_id);
 	}
-	if (sp->wrk->gzip_resp && sp->req->esi_level == 0) {
+	if (sp->req->gzip_resp && sp->req->esi_level == 0) {
 		/* Emit a gzip literal block with finish bit set */
 		tailbuf[0] = 0x01;
 		tailbuf[1] = 0x00;
@@ -412,10 +412,10 @@ ESI_Deliver(struct sess *sp)
 		tailbuf[4] = 0xff;
 
 		/* Emit CRC32 */
-		vle32enc(tailbuf + 5, sp->wrk->crc);
+		vle32enc(tailbuf + 5, sp->req->crc);
 
 		/* MOD(2^32) length */
-		vle32enc(tailbuf + 9, sp->wrk->l_crc);
+		vle32enc(tailbuf + 9, sp->req->l_crc);
 
 		(void)WRW_Write(sp->wrk, tailbuf, 13);
 	}
@@ -560,6 +560,6 @@ ESI_DeliverChild(const struct sess *sp)
 	p = st->ptr + st->len - 8;
 	icrc = vle32dec(p);
 	ilen = vle32dec(p + 4);
-	sp->wrk->crc = crc32_combine(sp->wrk->crc, icrc, ilen);
-	sp->wrk->l_crc += ilen;
+	sp->req->crc = crc32_combine(sp->req->crc, icrc, ilen);
+	sp->req->l_crc += ilen;
 }
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 2236f0b..9b0760c 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -255,7 +255,6 @@ Pool_Work_Thread(void *priv, struct worker *wrk)
 
 			stats_clean = 0;
 			wrk->lastused = NAN;
-			wrk->storage_hint = NULL;
 
 			AZ(wrk->sp->wrk);
 			THR_SetSession(wrk->sp);
@@ -267,7 +266,6 @@ Pool_Work_Thread(void *priv, struct worker *wrk)
 			WS_Assert(wrk->ws);
 			AZ(wrk->busyobj);
 			AZ(wrk->wrw.wfd);
-			AZ(wrk->storage_hint);
 			assert(wrk->wlp == wrk->wlb);
 			if (cache_param->diag_bitmap & 0x00040000) {
 				if (wrk->vcl != NULL)
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 1abb12b..fc94c22 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -307,10 +307,10 @@ RES_WriteObj(struct sess *sp)
 		/* Nothing to do here */
 	} else if (sp->wrk->res_mode & RES_ESI) {
 		ESI_Deliver(sp);
-	} else if (sp->wrk->res_mode & RES_ESI_CHILD && sp->wrk->gzip_resp) {
+	} else if (sp->wrk->res_mode & RES_ESI_CHILD && sp->req->gzip_resp) {
 		ESI_DeliverChild(sp);
 	} else if (sp->wrk->res_mode & RES_ESI_CHILD &&
-	    !sp->wrk->gzip_resp && sp->req->obj->gziped) {
+	    !sp->req->gzip_resp && sp->req->obj->gziped) {
 		res_WriteGunzipObj(sp);
 	} else if (sp->wrk->res_mode & RES_GUNZIP) {
 		res_WriteGunzipObj(sp);
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index cb66ff7..e051dbb 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -283,8 +283,8 @@ const char * __match_proto__()
 VRT_r_beresp_storage(struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	if (sp->wrk->storage_hint != NULL)
-		return (sp->wrk->storage_hint);
+	if (sp->req->storage_hint != NULL)
+		return (sp->req->storage_hint);
 	else
 		return (NULL);
 }
@@ -298,7 +298,7 @@ VRT_l_beresp_storage(struct sess *sp, const char *str, ...)
 	va_start(ap, str);
 	b = VRT_String(sp->wrk->ws, NULL, str, ap);
 	va_end(ap);
-	sp->wrk->storage_hint = b;
+	sp->req->storage_hint = b;
 }
 
 /*--------------------------------------------------------------------*/



From phk at varnish-cache.org  Mon Dec 26 10:33:36 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 11:33:36 +0100
Subject: [master] 903f1a0 Reduce the scope of the SHA256 contexts memory
	demand, we only need it during vcl_hash{}
Message-ID: <E1Rf7s8-0005MX-M4@project.varnish-software.com>

commit 903f1a06e7e4ebf40c99a158fa0e62b9bf01ee6c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 10:32:58 2011 +0000

    Reduce the scope of the SHA256 contexts memory demand, we only
    need it during vcl_hash{}

diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index 81a0c67..4967c82 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1459,6 +1459,7 @@ static int
 cnt_recv(struct sess *sp, struct worker *wrk, struct req *req)
 {
 	unsigned recv_handling;
+	struct SHA256Context sha256ctx;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
@@ -1502,10 +1503,12 @@ cnt_recv(struct sess *sp, struct worker *wrk, struct req *req)
 		}
 	}
 
+	req->sha256ctx = &sha256ctx;
 	SHA256_Init(req->sha256ctx);
 	VCL_hash_method(sp);
 	assert(req->handling == VCL_RET_HASH);
 	SHA256_Final(req->digest, req->sha256ctx);
+	req->sha256ctx = NULL;
 
 	if (!strcmp(req->http->hd[HTTP_HDR_REQ].b, "HEAD"))
 		req->wantbody = 0;
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 643eb94..d967291 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -158,6 +158,7 @@ HSH_AddString(const struct sess *sp, const char *str)
 		str = "";
 	l = strlen(str);
 
+	AN(sp->req->sha256ctx);
 	SHA256_Update(sp->req->sha256ctx, str, l);
 	SHA256_Update(sp->req->sha256ctx, "#", 1);
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index d26bd8f..ee5060f 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -42,7 +42,6 @@
 #include "cache.h"
 
 #include "waiter/waiter.h"
-#include "vsha256.h"
 #include "vtim.h"
 
 static unsigned ses_size = sizeof (struct sess);
@@ -271,10 +270,7 @@ SES_GetReq(struct sess *sp)
 	nhttp = (uint16_t)cache_param->http_max_hdr;
 	hl = HTTP_estimate(nhttp);
 
-	xxxassert(sz > 3 * hl + sizeof(struct SHA256Context) + 128);
-
-	sp->req->sha256ctx = (void*)p;
-	p += sizeof(struct SHA256Context);
+	xxxassert(sz > 3 * hl + 128);
 
 	sp->req->http = HTTP_create(p, nhttp);
 	p += hl;		// XXX: align ?



From phk at varnish-cache.org  Mon Dec 26 16:28:25 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 17:28:25 +0100
Subject: [master] b099f90 Shave 88 bytes of struct dstat and struct worker by
	not marking stats counters as worker-local unless they actually are.
Message-ID: <E1RfDPV-00052s-38@project.varnish-software.com>

commit b099f90867d1c99e45164ec5aa577d606fdd5596
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 16:27:42 2011 +0000

    Shave 88 bytes of struct dstat and struct worker by not marking
    stats counters as worker-local unless they actually are.

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index 2432691..de8265d 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -137,6 +137,8 @@ cli_debug_sizeof(struct cli *cli, const char * const *av, void *priv)
 	SZOF(struct vbc);
 	SZOF(struct VSC_C_main);
 	SZOF(struct lock);
+	SZOF(struct wrw);
+	SZOF(struct dstat);
 #if 0
 #define OFOF(foo, bar)	{ foo __foo; VCLI_Out(cli, \
     "%-30s = 0x%4zx @ 0x%4zx\n", \
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index 4963b7d..df7984a 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -150,56 +150,56 @@ VSC_F(fetch_304,		uint64_t, 1, 'a', "Fetch no body (304)", "")
  *
  */
 
-VSC_F(pools,			uint64_t, 1, 'g',
+VSC_F(pools,			uint64_t, 0, 'g',
     "Number of thread pools",
 	"Number of thread pools.  See also param wthread_pools."
 	"  NB: Presently pools cannot be removed once created."
 )
 
-VSC_F(threads,			uint64_t, 1, 'g',
+VSC_F(threads,			uint64_t, 0, 'g',
     "Total number of threads",
 	"Number of threads in all pools."
 	"  See also params thread_pools, thread_pool_min & thread_pool_max."
 )
 
-VSC_F(threads_limited,		uint64_t, 1, 'c',
+VSC_F(threads_limited,		uint64_t, 0, 'c',
     "Threads hit max",
 	"Number of times more threads were needed, but limit was reached"
 	" in a thread pool."
 	"  See also param thread_pool_max."
 )
 
-VSC_F(threads_created,		uint64_t, 1, 'c',
+VSC_F(threads_created,		uint64_t, 0, 'c',
     "Threads created",
 	"Total number of threads created in all pools."
 )
 
-VSC_F(threads_destroyed,	uint64_t, 1, 'c',
+VSC_F(threads_destroyed,	uint64_t, 0, 'c',
     "Threads destoryed",
 	"Total number of threads destroyed in all pools."
 )
 
-VSC_F(threads_failed,		uint64_t, 1, 'c',
+VSC_F(threads_failed,		uint64_t, 0, 'c',
     "Thread creation failed",
 	"Number of times creating a thread failed."
 	"  See VSL::Debug for diagnostics."
 	"  See also param thread_fail_delay."
 )
 
-VSC_F(thread_queue_len,		uint64_t, 1, 'g',
+VSC_F(thread_queue_len,		uint64_t, 0, 'g',
     "Length of session queue",
 	"Length of session queue waiting for threads."
 	"  NB: Only updates once per second."
 	"  See also param queue_max."
 )
 
-VSC_F(sess_queued,		uint64_t, 1, 'c',
+VSC_F(sess_queued,		uint64_t, 0, 'c',
     "Sessions queued for thread",
 	"Number of times session was queued waiting for a thread."
 	"  See also param queue_max."
 )
 
-VSC_F(sess_dropped,		uint64_t, 1, 'c',
+VSC_F(sess_dropped,		uint64_t, 0, 'c',
     "Sessions dropped for thread",
 	"Number of times session was dropped because the queue were too"
 	" long already."
@@ -210,12 +210,12 @@ VSC_F(sess_dropped,		uint64_t, 1, 'c',
  * BusyObj
  */
 
-VSC_F(busyobj_alloc,		uint64_t, 1, 'c',
+VSC_F(busyobj_alloc,		uint64_t, 0, 'c',
     "Busyobj allocations",
 	"Number of busyobj structures allocated."
 )
 
-VSC_F(busyobj_free,		uint64_t, 1, 'c',
+VSC_F(busyobj_free,		uint64_t, 0, 'c',
     "Busyobj freed",
 	"Number of busyobj structures freed."
 )
@@ -246,17 +246,17 @@ VSC_F(n_objwrite,		uint64_t, 0, 'a', "Objects sent with write",
 VSC_F(n_objoverflow,	uint64_t, 1, 'a',
 					"Objects overflowing workspace", "")
 
-VSC_F(s_sess,		uint64_t, 1, 'a', "Total Sessions", "")
-VSC_F(s_req,		uint64_t, 1, 'a', "Total Requests", "")
-VSC_F(s_pipe,		uint64_t, 1, 'a', "Total pipe", "")
-VSC_F(s_pass,		uint64_t, 1, 'a', "Total pass", "")
-VSC_F(s_fetch,		uint64_t, 1, 'a', "Total fetch", "")
+VSC_F(s_sess,			uint64_t, 1, 'a', "Total Sessions", "")
+VSC_F(s_req,			uint64_t, 1, 'a', "Total Requests", "")
+VSC_F(s_pipe,			uint64_t, 1, 'a', "Total pipe", "")
+VSC_F(s_pass,			uint64_t, 1, 'a', "Total pass", "")
+VSC_F(s_fetch,			uint64_t, 1, 'a', "Total fetch", "")
 VSC_F(s_hdrbytes,		uint64_t, 1, 'a', "Total header bytes", "")
 VSC_F(s_bodybytes,		uint64_t, 1, 'a', "Total body bytes", "")
 
 VSC_F(sess_closed,		uint64_t, 1, 'a', "Session Closed", "")
-VSC_F(sess_pipeline,	uint64_t, 1, 'a', "Session Pipeline", "")
-VSC_F(sess_readahead,	uint64_t, 1, 'a', "Session Read Ahead", "")
+VSC_F(sess_pipeline,		uint64_t, 1, 'a', "Session Pipeline", "")
+VSC_F(sess_readahead,		uint64_t, 1, 'a', "Session Read Ahead", "")
 VSC_F(sess_linger,		uint64_t, 1, 'a', "Session Linger", "")
 VSC_F(sess_herd,		uint64_t, 1, 'a', "Session herd", "")
 
@@ -264,11 +264,11 @@ VSC_F(shm_records,		uint64_t, 0, 'a', "SHM records", "")
 VSC_F(shm_writes,		uint64_t, 0, 'a', "SHM writes", "")
 VSC_F(shm_flushes,		uint64_t, 0, 'a',
     "SHM flushes due to overflow", "")
-VSC_F(shm_cont,		uint64_t, 0, 'a', "SHM MTX contention", "")
+VSC_F(shm_cont,			uint64_t, 0, 'a', "SHM MTX contention", "")
 VSC_F(shm_cycles,		uint64_t, 0, 'a',
     "SHM cycles through buffer", "")
 
-VSC_F(sms_nreq,		uint64_t, 0, 'a', "SMS allocator requests", "")
+VSC_F(sms_nreq,			uint64_t, 0, 'a', "SMS allocator requests", "")
 VSC_F(sms_nobj,		uint64_t, 0, 'i', "SMS outstanding allocations", "")
 VSC_F(sms_nbytes,		uint64_t, 0, 'i', "SMS outstanding bytes", "")
 VSC_F(sms_balloc,		uint64_t, 0, 'i', "SMS bytes allocated", "")
@@ -276,9 +276,9 @@ VSC_F(sms_bfree,		uint64_t, 0, 'i', "SMS bytes freed", "")
 
 VSC_F(backend_req,		uint64_t, 0, 'a', "Backend requests made", "")
 
-VSC_F(n_vcl,		uint64_t, 0, 'a', "N vcl total", "")
+VSC_F(n_vcl,			uint64_t, 0, 'a', "N vcl total", "")
 VSC_F(n_vcl_avail,		uint64_t, 0, 'a', "N vcl available", "")
-VSC_F(n_vcl_discard,	uint64_t, 0, 'a', "N vcl discarded", "")
+VSC_F(n_vcl_discard,		uint64_t, 0, 'a', "N vcl discarded", "")
 
 /**********************************************************************/
 



From phk at varnish-cache.org  Mon Dec 26 16:45:22 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 17:45:22 +0100
Subject: [master] a2e72e8 Add vsc for requested and needed sizes for mempool.
Message-ID: <E1RfDfu-0006qN-2p@project.varnish-software.com>

commit a2e72e8fa66d871903f99a4973687ba7c3c6a7c8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 16:36:09 2011 +0000

    Add vsc for requested and needed sizes for mempool.
    
    Fix sess mempool names

diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 6f556f2..a9d4249 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -80,6 +80,8 @@ mpl_alloc(const struct mempool *mpl)
 	AN(mi);
 	mi->magic = MEMITEM_MAGIC;
 	mi->size = tsz;
+	mpl->vsc->sz_wanted = tsz;
+	mpl->vsc->sz_needed = tsz + sizeof *mi;
 	return (mi);
 }
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index ee5060f..d1dbaba 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -318,6 +318,7 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
 	bprintf(nb, "req%u", pool_no);
 	pp->mpl_req = MPL_New(nb, &cache_param->req_pool,
 	    &cache_param->workspace_client);
+	bprintf(nb, "sess%u", pool_no);
 	pp->mpl_sess = MPL_New(nb, &cache_param->sess_pool, &ses_size);
 	return (pp);
 }



From phk at varnish-cache.org  Mon Dec 26 16:45:22 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Mon, 26 Dec 2011 17:45:22 +0100
Subject: [master] 1b75dc8 These escaped last commit.
Message-ID: <E1RfDfu-0006qS-5I@project.varnish-software.com>

commit 1b75dc8d2b1a98297eb4adc5df080e80c2edc333
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 26 16:45:11 2011 +0000

    These escaped last commit.

diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 3d1e30a..2d83f69 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -111,6 +111,8 @@ VSC_F(happy,		uint64_t, 0, 'b', "Happy health probes", "")
 
 VSC_F(live,			uint64_t, 0, 'g', "In use", "")
 VSC_F(pool,			uint64_t, 0, 'g', "In Pool", "")
+VSC_F(sz_wanted,		uint64_t, 0, 'g', "Size requested", "")
+VSC_F(sz_needed,		uint64_t, 0, 'g', "Size allocated", "")
 VSC_F(allocs,			uint64_t, 0, 'c', "Allocations", "")
 VSC_F(frees,			uint64_t, 0, 'c', "Frees", "")
 VSC_F(recycle,			uint64_t, 0, 'c', "Recycled from pool", "")



From phk at varnish-cache.org  Tue Dec 27 14:56:52 2011
From: phk at varnish-cache.org (Poul-Henning Kamp)
Date: Tue, 27 Dec 2011 15:56:52 +0100
Subject: [master] 9e0f29c Attempt to close a theoretical race,
	which POSIX_MISTAKE makes it impossible to deal with correctly.
Message-ID: <E1RfYSS-0004Nh-4Y@project.varnish-software.com>

commit 9e0f29cdcdb3c96ac559692f21bdeaa7ecc9272a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 27 14:55:59 2011 +0000

    Attempt to close a theoretical race, which POSIX_MISTAKE makes it
    impossible to deal with correctly.
    
    Pointed out by:		Dong Feng

diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index cff9845..2910582 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -98,6 +98,17 @@ Lck__Unlock(struct lock *lck, const char *p, const char *f, int l)
 	assert(pthread_equal(ilck->owner, pthread_self()));
 	AN(ilck->held);
 	ilck->held = 0;
+	/*
+	 * #ifdef POSIX_STUPIDITY:
+	 * The pthread_t type has no defined assignment or comparison
+	 * operators, this is why pthread_equal() is necessary.
+	 * Unfortunately POSIX forgot to define a NULL value for pthread_t
+	 * so you can never unset a pthread_t variable.
+	 * We hack it and fill it with zero bits, hoping for sane
+	 * implementations of pthread.
+	 * #endif
+	 */ 
+	memset(&ilck->owner, 0, sizeof ilck->owner);
 	AZ(pthread_mutex_unlock(&ilck->mtx));
 	if (cache_param->diag_bitmap & 0x8)
 		VSL(SLT_Debug, 0, "MTX_UNLOCK(%s,%s,%d,%s)", p, f, l, ilck->w);



From lkarsten at varnish-cache.org  Wed Dec 28 14:45:39 2011
From: lkarsten at varnish-cache.org (Lasse Karstensen)
Date: Wed, 28 Dec 2011 15:45:39 +0100
Subject: [master] c522799 Misleading use of key= instead of key: which is
	correct.
Message-ID: <E1Rful9-0007nb-39@project.varnish-software.com>

commit c522799663d9fba682a74dde6736c7dbe4286f74
Author: Lasse Karstensen <lasse at varnish-software.com>
Date:   Wed Dec 28 15:45:36 2011 +0100

    Misleading use of key= instead of key: which is correct.

diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
index 8499d29..91622d8 100644
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@ -120,7 +120,7 @@ The following options are available:
 		     cache hit, miss, pass, pipe or error.
 	
 		   VCL_Log:key
-		     Output value set by std.log("key=value") in VCL.
+		     Output value set by std.log("key:value") in VCL.
 		     
 
 -m tag:regex only list records where tag matches regex. Multiple



From lkarsten at varnish-cache.org  Wed Dec 28 15:18:21 2011
From: lkarsten at varnish-cache.org (Lasse Karstensen)
Date: Wed, 28 Dec 2011 16:18:21 +0100
Subject: [master] 0b1e63e Fix inconsistant man page, as reported by Chris Adams
Message-ID: <E1RfvGn-00040M-ST@project.varnish-software.com>

commit 0b1e63e3c5b70ba7915a633278127c82d5111556
Author: Lasse Karstensen <lasse at varnish-software.com>
Date:   Wed Dec 28 16:17:57 2011 +0100

    Fix inconsistant man page, as reported by Chris Adams

diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
index 91622d8..0b3f97f 100644
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@ -15,7 +15,7 @@ Display Varnish logs in Apache / NCSA combined log format
 SYNOPSIS
 ========
 
-varnishncsa [-a] [-b] [-C] [-c] [-D] [-d] [-f] [-F format] [-I regex]
+varnishncsa [-a] [-C] [-D] [-d] [-f] [-F format] [-I regex]
 [-i tag] [-n varnish_name] [-m tag:regex ...] [-P file] [-r file] [-V] [-w file] 
 [-X regex] [-x tag]
 
@@ -30,16 +30,8 @@ The following options are available:
 
 -a          When writing to a file, append to it rather than overwrite it.
 
--b          Include log entries which result from communication with a 
-	    backend server.  If neither -b nor -c is
-	    specified, varnishncsa acts as if they both were.
-
 -C          Ignore case when matching regular expressions.
 
--c          Include log entries which result from communication 
-	    with a client.  If neither -b nor -c is specified, 
-	    varnishncsa acts as if they both were.
-
 -D          Daemonize.
 
 -d          Process old log entries on startup.  Normally, varnishncsa