[master] 5b969ad Remove the now unused queue of sessions.
Poul-Henning Kamp
phk at varnish-cache.org
Mon Jan 23 12:25:50 CET 2012
commit 5b969ad5d9d7adc7d7cf09f5cc767965653238f7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jan 23 11:25:40 2012 +0000
Remove the now unused queue of sessions.
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 20dc38a..91c8e24 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -104,7 +104,6 @@ struct pool {
struct workerhead idle;
VTAILQ_HEAD(, pool_task) front_queue;
VTAILQ_HEAD(, pool_task) back_queue;
- VTAILQ_HEAD(, sess) queue;
VTAILQ_HEAD(, poolsock) socks;
unsigned nthr;
unsigned lqueue;
@@ -279,14 +278,7 @@ Pool_Work_Thread(void *priv, struct worker *wrk)
continue;
}
- wrk->sp = VTAILQ_FIRST(&pp->queue);
- if (wrk->sp != NULL) {
- /* Process queued requests, if any */
- assert(pp->lqueue > 0);
- VTAILQ_REMOVE(&pp->queue, wrk->sp, list);
- wrk->do_what = pool_do_sess;
- pp->lqueue--;
- } else if (!VTAILQ_EMPTY(&pp->socks)) {
+ if (!VTAILQ_EMPTY(&pp->socks)) {
/* Accept on a socket */
ps = VTAILQ_FIRST(&pp->socks);
VTAILQ_REMOVE(&pp->socks, ps, list);
@@ -505,7 +497,6 @@ pool_mkpool(unsigned pool_no)
XXXAN(pp);
Lck_New(&pp->mtx, lck_wq);
- VTAILQ_INIT(&pp->queue);
VTAILQ_INIT(&pp->idle);
VTAILQ_INIT(&pp->socks);
VTAILQ_INIT(&pp->front_queue);
More information about the varnish-commit
mailing list