[master] a84f28e Rename to more appropriate names: It's about the tasks not the pools that service them.

[Poul-Henning Kamp]

commit a84f28ee669ed7fb983de6a5a7d6d1b1bb2972e0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jun 9 19:48:05 2015 +0000

    Rename to more appropriate names:  It's about the tasks not the
    pools that service them.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 72a61f9..890ebe2 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -313,9 +313,9 @@ struct pool_task {
 	void				*priv;
 };
 
-enum pool_how {
-	POOL_QUEUE_FRONT,
-	POOL_QUEUE_BACK
+enum task_how {
+	TASK_QUEUE_FRONT,
+	TASK_QUEUE_BACK
 };
 
 /*--------------------------------------------------------------------*/
@@ -946,13 +946,13 @@ const char *sess_close_2str(enum sess_close sc, int want_desc);
 
 /* cache_pool.c */
 void Pool_Init(void);
-int Pool_Task(struct pool *pp, struct pool_task *task, enum pool_how how);
+int Pool_Task(struct pool *pp, struct pool_task *task, enum task_how how);
 int Pool_Task_Arg(struct worker *, task_func_t *,
     const void *arg, size_t arg_len);
 void Pool_Sumstat(struct worker *w);
 int Pool_TrySumstat(struct worker *wrk);
 void Pool_PurgeStat(unsigned nobj);
-int Pool_Task_Any(struct pool_task *task, enum pool_how how);
+int Pool_Task_Any(struct pool_task *task, enum task_how how);
 
 #define V1L_IsReleased(w)	((w)->v1l == NULL)
 void V1L_Chunked(const struct worker *w);
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 45a1828..479754e 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -437,7 +437,7 @@ vca_accept_task(struct worker *wrk, void *arg)
 			 * must reschedule the listening task so it will be
 			 * taken up by another thread again.
 			 */
-			AZ(Pool_Task(wrk->pool, &ps->task, POOL_QUEUE_BACK));
+			AZ(Pool_Task(wrk->pool, &ps->task, TASK_QUEUE_BACK));
 			return;
 		}
 
@@ -468,7 +468,7 @@ VCA_NewPool(struct pool *pp)
 		ps->task.func = vca_accept_task;
 		ps->task.priv = ps;
 		ps->pool = pp;
-		AZ(Pool_Task(pp, &ps->task, POOL_QUEUE_BACK));
+		AZ(Pool_Task(pp, &ps->task, TASK_QUEUE_BACK));
 	}
 }
 
diff --git a/bin/varnishd/cache/cache_backend_poll.c b/bin/varnishd/cache/cache_backend_poll.c
index 641ed4e..0d06693 100644
--- a/bin/varnishd/cache/cache_backend_poll.c
+++ b/bin/varnishd/cache/cache_backend_poll.c
@@ -363,7 +363,7 @@ vbp_thread(struct worker *wrk, void *priv)
 		vt->task.func = vbp_task;
 		vt->task.priv = vt;
 
-		if (Pool_Task_Any(&vt->task, POOL_QUEUE_FRONT)) {
+		if (Pool_Task_Any(&vt->task, TASK_QUEUE_FRONT)) {
 			Lck_Lock(&vbp_mtx);
 			vt->running = 0;
 			Lck_Unlock(&vbp_mtx);
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 92a9c7f..73ad0a4 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -1003,7 +1003,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
 	bo->fetch_task.priv = bo_fetch;
 	bo->fetch_task.func = vbf_fetch_thread;
 
-	if (Pool_Task(wrk->pool, &bo->fetch_task, POOL_QUEUE_FRONT)) {
+	if (Pool_Task(wrk->pool, &bo->fetch_task, TASK_QUEUE_FRONT)) {
 		wrk->stats->fetch_no_thread++;
 		(void)vbf_stp_fail(req->wrk, bo);
 		if (bo->stale_oc != NULL)
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 56f11bf..f02e594 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -91,7 +91,7 @@ Pool_TrySumstat(struct worker *wrk)
  */
 
 int
-Pool_Task_Any(struct pool_task *task, enum pool_how how)
+Pool_Task_Any(struct pool_task *task, enum task_how how)
 {
 	struct pool *pp;
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 9820758..30f4b08 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -415,7 +415,7 @@ SES_Reschedule_Req(struct req *req)
 	req->task.func = SES_Proto_Req;
 	req->task.priv = req;
 
-	return (Pool_Task(pp, &req->task, POOL_QUEUE_FRONT));
+	return (Pool_Task(pp, &req->task, TASK_QUEUE_FRONT));
 }
 
 /*--------------------------------------------------------------------
@@ -451,7 +451,7 @@ ses_handle(struct waited *wp, enum wait_event ev, double now)
 		tp = (void*)sp->ws->f;
 		tp->func = SES_Proto_Sess;
 		tp->priv = sp;
-		if (Pool_Task(pp, tp, POOL_QUEUE_FRONT))
+		if (Pool_Task(pp, tp, TASK_QUEUE_FRONT))
 			SES_Delete(sp, SC_OVERLOAD, now);
 		break;
 	case WAITER_CLOSE:
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index dd370e0..466b7b9 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -218,7 +218,7 @@ Pool_Task_Arg(struct worker *wrk, task_func_t *func,
  */
 
 int
-Pool_Task(struct pool *pp, struct pool_task *task, enum pool_how how)
+Pool_Task(struct pool *pp, struct pool_task *task, enum task_how how)
 {
 	struct worker *wrk;
 	int retval = 0;
@@ -245,7 +245,7 @@ Pool_Task(struct pool *pp, struct pool_task *task, enum pool_how how)
 	}
 
 	switch (how) {
-	case POOL_QUEUE_FRONT:
+	case TASK_QUEUE_FRONT:
 		/* If we have too much in the queue already, refuse. */
 		if (pp->lqueue > cache_param->wthread_queue_limit) {
 			pp->ndropped++;
@@ -256,11 +256,11 @@ Pool_Task(struct pool *pp, struct pool_task *task, enum pool_how how)
 			pp->lqueue++;
 		}
 		break;
-	case POOL_QUEUE_BACK:
+	case TASK_QUEUE_BACK:
 		VTAILQ_INSERT_TAIL(&pp->back_queue, task, list);
 		break;
 	default:
-		WRONG("Unknown enum pool_how");
+		WRONG("Unknown enum task_how");
 	}
 	Lck_Unlock(&pp->mtx);
 	return (retval);