Skip to content

V
varnish-cache
Commit aebdba1a authored by Dridi Boukelmoune's avatar Dridi Boukelmoune Committed by Poul-Henning Kamp
Browse files
Options

Undo the enum tweak change

parent 06bb2409
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 37 deletions
bin/varnishd/mgt/mgt_param.h
View file @ aebdba1a
...@@ -74,14 +74,7 @@ tweak_t tweak_uint; ...@@ -74,14 +74,7 @@ tweak_t tweak_uint;
tweak_t tweak_vsl_buffer; tweak_t tweak_vsl_buffer;
tweak_t tweak_vsl_reclen; tweak_t tweak_vsl_reclen;
enum tweak_e { int tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest,
TWEAK_OK,
TWEAK_ERR,
TWEAK_BELOW_MIN,
TWEAK_ABOVE_MAX,
};
enum tweak_e tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest,
const char *arg, const char *min, const char *max, const char *arg, const char *min, const char *max,
const char *min_reason, const char *max_reason); const char *min_reason, const char *max_reason);
......
bin/varnishd/mgt/mgt_param_tweak.c
View file @ aebdba1a
...@@ -156,7 +156,7 @@ tweak_bool(struct vsb *vsb, const struct parspec *par, const char *arg) ...@@ -156,7 +156,7 @@ tweak_bool(struct vsb *vsb, const struct parspec *par, const char *arg)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
enum tweak_e int
tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
const char *min, const char *max, const char *min, const char *max,
const char *min_reason, const char *max_reason) const char *min_reason, const char *max_reason)
...@@ -170,7 +170,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, ...@@ -170,7 +170,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
minv = strtoul(min, &p, 0); minv = strtoul(min, &p, 0);
if (*arg == '\0' || *p != '\0') { if (*arg == '\0' || *p != '\0') {
VSB_printf(vsb, "Illegal Min: %s\n", min); VSB_printf(vsb, "Illegal Min: %s\n", min);
return (TWEAK_ERR); return (-1);
} }
} }
if (max != NULL) { if (max != NULL) {
...@@ -178,7 +178,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, ...@@ -178,7 +178,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
maxv = strtoul(max, &p, 0); maxv = strtoul(max, &p, 0);
if (*arg == '\0' || *p != '\0') { if (*arg == '\0' || *p != '\0') {
VSB_printf(vsb, "Illegal Max: %s\n", max); VSB_printf(vsb, "Illegal Max: %s\n", max);
return (TWEAK_ERR); return (-1);
} }
} }
p = NULL; p = NULL;
...@@ -188,7 +188,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, ...@@ -188,7 +188,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
u = strtoul(arg, &p, 0); u = strtoul(arg, &p, 0);
if (*arg == '\0' || *p != '\0') { if (*arg == '\0' || *p != '\0') {
VSB_printf(vsb, "Not a number (%s)\n", arg); VSB_printf(vsb, "Not a number (%s)\n", arg);
return (TWEAK_ERR); return (-1);
} }
} }
if (min != NULL && u < minv) { if (min != NULL && u < minv) {
...@@ -196,14 +196,14 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, ...@@ -196,14 +196,14 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
if (min_reason != NULL) if (min_reason != NULL)
VSB_printf(vsb, " %s", min_reason); VSB_printf(vsb, " %s", min_reason);
VSB_putc(vsb, '\n'); VSB_putc(vsb, '\n');
return (TWEAK_BELOW_MIN); return (-1);
} }
if (max != NULL && u > maxv) { if (max != NULL && u > maxv) {
VSB_printf(vsb, "Must be no more than %s", max); VSB_printf(vsb, "Must be no more than %s", max);
if (max_reason != NULL) if (max_reason != NULL)
VSB_printf(vsb, " %s", max_reason); VSB_printf(vsb, " %s", max_reason);
VSB_putc(vsb, '\n'); VSB_putc(vsb, '\n');
return (TWEAK_ABOVE_MAX); return (-1);
} }
*dest = u; *dest = u;
} else if (*dest == UINT_MAX && arg != JSON_FMT) { } else if (*dest == UINT_MAX && arg != JSON_FMT) {
...@@ -211,7 +211,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg, ...@@ -211,7 +211,7 @@ tweak_generic_uint(struct vsb *vsb, volatile unsigned *dest, const char *arg,
} else { } else {
VSB_printf(vsb, "%u", *dest); VSB_printf(vsb, "%u", *dest);
} }
return (TWEAK_OK); return (0);
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
......
bin/varnishd/mgt/mgt_pool.c
View file @ aebdba1a
...@@ -57,38 +57,30 @@ static int ...@@ -57,38 +57,30 @@ static int
tweak_thread_pool_min(struct vsb *vsb, const struct parspec *par, tweak_thread_pool_min(struct vsb *vsb, const struct parspec *par,
const char *arg) const char *arg)
{ {
enum tweak_e tweak;
tweak = tweak_generic_uint(vsb, par->priv, arg, par->min, par->max, if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
par->dyn_min_reason, par->dyn_max_reason); par->dyn_min_reason, par->dyn_max_reason))
return (-1);
if (tweak == TWEAK_OK) { MCF_ParamConf(MCF_MINIMUM, "thread_pool_max",
MCF_ParamConf(MCF_MINIMUM, "thread_pool_max", "%u", mgt_param.wthread_min);
"%u", mgt_param.wthread_min); MCF_ParamConf(MCF_MAXIMUM, "thread_pool_reserve",
MCF_ParamConf(MCF_MAXIMUM, "thread_pool_reserve", "%u", mgt_param.wthread_min * 950 / 1000);
"%u", mgt_param.wthread_min * 950 / 1000); return (0);
return (0);
}
return (-1);
} }
static int static int
tweak_thread_pool_max(struct vsb *vsb, const struct parspec *par, tweak_thread_pool_max(struct vsb *vsb, const struct parspec *par,
const char *arg) const char *arg)
{ {
enum tweak_e tweak;
tweak = tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
par->dyn_min_reason, par->dyn_max_reason);
if (tweak == TWEAK_OK) { if (tweak_generic_uint(vsb, par->priv, arg, par->min, par->max,
MCF_ParamConf(MCF_MAXIMUM, "thread_pool_min", par->dyn_min_reason, par->dyn_max_reason))
"%u", mgt_param.wthread_max); return (-1);
return (0);
}
return (-1); MCF_ParamConf(MCF_MAXIMUM, "thread_pool_min",
"%u", mgt_param.wthread_max);
return (0);
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment