[4.1] d564695 clarify that the enum implies a priority
PÃ¥l Hermunn Johansen
hermunn at varnish-software.com
Tue Nov 22 14:31:05 CET 2016
commit d564695c0fd6c3e68d3848944d8e9e0e8ca7469c
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Thu Oct 27 08:56:56 2016 +0200
clarify that the enum implies a priority
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index d64d007..6ac1972 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -314,7 +314,8 @@ struct pool_task {
void *priv;
};
-enum task_how {
+/* tasks are taken off the queues in this order */
+enum task_prio {
TASK_QUEUE_BO,
TASK_QUEUE_REQ,
TASK_QUEUE_VCA,
@@ -887,13 +888,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_how how);
+int Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio 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 task_how how);
+int Pool_Task_Any(struct pool_task *task, enum task_prio how);
/* 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 d3deed2..409d2c3 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_how how)
+Pool_Task_Any(struct pool_task *task, enum task_prio how)
{
struct pool *pp;
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 4f7460f..01f5902 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 task_how how)
+Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio how)
{
struct worker *wrk;
int retval = 0;
More information about the varnish-commit
mailing list