[PATCH 18/25] Allow flip-flop streaming on pass

Martin Blix Grydeland martin at varnish-software.com
Sun Jan 22 18:53:24 CET 2012


---
 bin/varnishd/cache/cache_center.c   |    4 ----
 bin/varnishd/cache/cache_response.c |    1 -
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/bin/varnishd/cache/cache_center.c b/bin/varnishd/cache/cache_center.c
index aaab4fd..96e23fc 100644
--- a/bin/varnishd/cache/cache_center.c
+++ b/bin/varnishd/cache/cache_center.c
@@ -1061,9 +1061,6 @@ cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 			/* We have no fetch worker */
 			if (req->obj->objcore == NULL ||
 			    req->obj->objcore->flags & OC_F_PASS) {
-				/* It's a pass, prefer flipflop
-				 * streaming. (MBGXXX: Flipflop not
-				 * finished yet) */
 				wrk->busyobj->do_stream_flipflop = 1;
 				wrk->stats.fetch_flipflop++;
 			}
@@ -1090,7 +1087,6 @@ cnt_streambody(struct sess *sp, struct worker *wrk, struct req *req)
 	if (wrk->busyobj->htc.ws == wrk->ws) {
 		/* Busyobj's htc has buffer on our workspace,
 		   wait for it to be released */
-		AZ(wrk->busyobj->do_stream_flipflop);
 		VBO_StreamWait(wrk->busyobj);
 	}
 
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index a49acbe..6bd4da7 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -465,7 +465,6 @@ RES_StreamPoll(struct worker *wrk)
 	VBO_StreamData(wrk->busyobj);
 	if (wrk->busyobj->do_stream_flipflop == 1) {
 		AN(wrk->sctx);
-		/* MBGXXX: Do flip-flop streaming */
 		/* MBGXXX: Loop around waiting for the lag behind to
 		 * be less than some configurable size, to keep the
 		 * cache memory usage low (this for streaming
-- 
1.7.4.1




More information about the varnish-dev mailing list