[master] fc71348 s/how/prio/ for consistency (followup to 2e2bfad)

[Dridi Boukelmoune]

commit fc71348b5ae6b1f4a1ea72dd4d57be2a93186b66
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Nov 3 18:02:50 2016 +0100

    s/how/prio/ for consistency (followup to 2e2bfad)

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 0d3543a..d71504e 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -924,13 +924,13 @@ const char *body_status_2str(enum body_status e);
 const char *sess_close_2str(enum sess_close sc, int want_desc);
 
 /* cache_pool.c */
-int Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio how);
+int Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio prio);
 int Pool_Task_Arg(struct worker *, enum task_prio, 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 task_prio how);
+int Pool_Task_Any(struct pool_task *task, enum task_prio prio);
 
 /* cache_range.c [VRG] */
 void VRG_dorange(struct req *req, const char *r);
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 9dfa2ed..2a64d4f 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 task_prio how)
+Pool_Task_Any(struct pool_task *task, enum task_prio prio)
 {
 	struct pool *pp;
 
@@ -105,7 +105,7 @@ Pool_Task_Any(struct pool_task *task, enum task_prio how)
 	if (pp == NULL)
 		return (-1);
 	// NB: When we remove pools, is there a race here ?
-	return (Pool_Task(pp, task, how));
+	return (Pool_Task(pp, task, prio));
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 6c66d67..55d149c 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -164,14 +164,14 @@ pool_reserve(void)
 /*--------------------------------------------------------------------*/
 
 static struct worker *
-pool_getidleworker(struct pool *pp, enum task_prio how)
+pool_getidleworker(struct pool *pp, enum task_prio prio)
 {
 	struct pool_task *pt = NULL;
 	struct worker *wrk;
 
 	CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
 	Lck_AssertHeld(&pp->mtx);
-	if (how <= TASK_QUEUE_RESERVE || pp->nidle > pool_reserve()) {
+	if (prio <= TASK_QUEUE_RESERVE || pp->nidle > pool_reserve()) {
 		pt = VTAILQ_FIRST(&pp->idle_queue);
 		if (pt == NULL)
 			AZ(pp->nidle);
@@ -197,7 +197,7 @@ pool_getidleworker(struct pool *pp, enum task_prio how)
  */
 
 int
-Pool_Task_Arg(struct worker *wrk, enum task_prio how, task_func_t *func,
+Pool_Task_Arg(struct worker *wrk, enum task_prio prio, task_func_t *func,
     const void *arg, size_t arg_len)
 {
 	struct pool *pp;
@@ -211,7 +211,7 @@ Pool_Task_Arg(struct worker *wrk, enum task_prio how, task_func_t *func,
 	CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
 
 	Lck_Lock(&pp->mtx);
-	wrk2 = pool_getidleworker(pp, how);
+	wrk2 = pool_getidleworker(pp, prio);
 	if (wrk2 != NULL) {
 		AN(pp->nidle);
 		VTAILQ_REMOVE(&pp->idle_queue, &wrk2->task, list);
@@ -238,20 +238,20 @@ Pool_Task_Arg(struct worker *wrk, enum task_prio how, task_func_t *func,
  */
 
 int
-Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio how)
+Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio prio)
 {
 	struct worker *wrk;
 	int retval = 0;
 	CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
 	AN(task);
 	AN(task->func);
-	assert(how < TASK_QUEUE_END);
+	assert(prio < TASK_QUEUE_END);
 
 	Lck_Lock(&pp->mtx);
 
 	/* The common case first:  Take an idle thread, do it. */
 
-	wrk = pool_getidleworker(pp, how);
+	wrk = pool_getidleworker(pp, prio);
 	if (wrk != NULL) {
 		AN(pp->nidle);
 		VTAILQ_REMOVE(&pp->idle_queue, &wrk->task, list);
@@ -268,12 +268,12 @@ Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio how)
 	 * queue limits only apply to client threads - all other
 	 * work is vital and needs do be done at the earliest
 	 */
-	if (how != TASK_QUEUE_REQ ||
+	if (prio != TASK_QUEUE_REQ ||
 	    pp->lqueue < cache_param->wthread_max +
 	    cache_param->wthread_queue_limit + pp->nthr) {
 		pp->nqueued++;
 		pp->lqueue++;
-		VTAILQ_INSERT_TAIL(&pp->queues[how], task, list);
+		VTAILQ_INSERT_TAIL(&pp->queues[prio], task, list);
 	} else {
 		pp->ndropped++;
 		retval = -1;