[master] ad22891 Loose the session watermark

Poul-Henning Kamp phk at varnish-cache.org
Tue Dec 20 12:43:59 CET 2011


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,



More information about the varnish-commit mailing list