Skip to content

V
varnish-cache
Commit 087329a5 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune
Browse files
Options

param: Introduce the notion of simple parameters 

The simple parameters are those that successfully migrated to params.h
because they were trivial to declare in a way that could be used in all
the places where they are needed.

The PARAM() macro is now changed so that the outstanding `type` argument
is separated from arguments matching struct parspec fields. To minimize
disruption the new PARAM_SIMPLE() macro takes parameters in the order of
the previous PARAM() definition.

Refs #3250
parent e954c73d
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 87 deletions
bin/varnishd/common/common_param.h
View file @ 087329a5
...@@ -82,7 +82,7 @@ struct params { ...@@ -82,7 +82,7 @@ struct params {
#define ptyp_uint unsigned #define ptyp_uint unsigned
#define ptyp_vsl_buffer unsigned #define ptyp_vsl_buffer unsigned
#define ptyp_vsl_reclen unsigned #define ptyp_vsl_reclen unsigned
#define PARAM(nm, ty, ...) \ #define PARAM(ty, nm, ...) \
ptyp_##ty nm; ptyp_##ty nm;
#include <tbl/params.h> #include <tbl/params.h>
#undef ptyp_bool #undef ptyp_bool
......
bin/varnishd/mgt/mgt_param_tbl.c
View file @ 087329a5
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
struct parspec mgt_parspec[] = { struct parspec mgt_parspec[] = {
#define PARAM(nm, ty, ...) { #nm, tweak_##ty, &mgt_param.nm, __VA_ARGS__ }, #define PARAM(ty, nm, ...) { #nm, __VA_ARGS__ },
#include "tbl/params.h" #include "tbl/params.h"
{ "cc_command", tweak_string, &mgt_cc_cmd, { "cc_command", tweak_string, &mgt_cc_cmd,
......
include/tbl/params.h
View file @ 087329a5
...@@ -27,14 +27,21 @@ ...@@ -27,14 +27,21 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* PARAM(nm, ty, ...) * PARAM(type, ...)
* *
* Variable arguments refer to struct parspec fields from min to * Variable arguments refer to struct parspec fields, except non-const
* dyn_def_reason. * strings.
*/ */
/*lint -save -e525 -e539 */ /*lint -save -e525 -e539 */
/*--------------------------------------------------------------------
* * Simple parameters
* */
#define PARAM_SIMPLE(nm, ty, ...) \
PARAM(ty, nm, tweak_##ty, &mgt_param.nm, __VA_ARGS__)
#if defined(XYZZY) #if defined(XYZZY)
#error "Temporary macro XYZZY already defined" #error "Temporary macro XYZZY already defined"
#endif #endif
...@@ -44,7 +51,7 @@ ...@@ -44,7 +51,7 @@
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ accept_filter, /* name */ accept_filter,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -65,7 +72,7 @@ PARAM( ...@@ -65,7 +72,7 @@ PARAM(
) )
#undef XYZZY #undef XYZZY
PARAM( PARAM_SIMPLE(
/* name */ acceptor_sleep_decay, /* name */ acceptor_sleep_decay,
/* type */ double, /* type */ double,
/* min */ "0", /* min */ "0",
...@@ -80,7 +87,7 @@ PARAM( ...@@ -80,7 +87,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ acceptor_sleep_incr, /* name */ acceptor_sleep_incr,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -95,7 +102,7 @@ PARAM( ...@@ -95,7 +102,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ acceptor_sleep_max, /* name */ acceptor_sleep_max,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -110,7 +117,7 @@ PARAM( ...@@ -110,7 +117,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ auto_restart, /* name */ auto_restart,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -121,7 +128,7 @@ PARAM( ...@@ -121,7 +128,7 @@ PARAM(
"Automatically restart the child/worker process if it dies." "Automatically restart the child/worker process if it dies."
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_dups, /* name */ ban_dups,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -135,7 +142,7 @@ PARAM( ...@@ -135,7 +142,7 @@ PARAM(
"identical." "identical."
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_cutoff, /* name */ ban_cutoff,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -165,7 +172,7 @@ PARAM( ...@@ -165,7 +172,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_lurker_age, /* name */ ban_lurker_age,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -181,7 +188,7 @@ PARAM( ...@@ -181,7 +188,7 @@ PARAM(
"This should be set to the approximate time which a ban-burst takes." "This should be set to the approximate time which a ban-burst takes."
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_lurker_batch, /* name */ ban_lurker_batch,
/* type */ uint, /* type */ uint,
/* min */ "1", /* min */ "1",
...@@ -194,7 +201,7 @@ PARAM( ...@@ -194,7 +201,7 @@ PARAM(
" Use this to pace the ban-lurker if it eats too many resources." " Use this to pace the ban-lurker if it eats too many resources."
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_lurker_sleep, /* name */ ban_lurker_sleep,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -208,7 +215,7 @@ PARAM( ...@@ -208,7 +215,7 @@ PARAM(
"A value of zero will disable the ban lurker entirely." "A value of zero will disable the ban lurker entirely."
) )
PARAM( PARAM_SIMPLE(
/* name */ ban_lurker_holdoff, /* name */ ban_lurker_holdoff,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -221,7 +228,7 @@ PARAM( ...@@ -221,7 +228,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ first_byte_timeout, /* name */ first_byte_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -236,7 +243,7 @@ PARAM( ...@@ -236,7 +243,7 @@ PARAM(
"This parameter does not apply to pipe'ed requests." "This parameter does not apply to pipe'ed requests."
) )
PARAM( PARAM_SIMPLE(
/* name */ between_bytes_timeout, /* name */ between_bytes_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0", /* min */ "0",
...@@ -250,7 +257,7 @@ PARAM( ...@@ -250,7 +257,7 @@ PARAM(
"This parameter does not apply to pipe'ed requests." "This parameter does not apply to pipe'ed requests."
) )
PARAM( PARAM_SIMPLE(
/* name */ backend_idle_timeout, /* name */ backend_idle_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "1", /* min */ "1",
...@@ -261,7 +268,7 @@ PARAM( ...@@ -261,7 +268,7 @@ PARAM(
"Timeout before we close unused backend connections." "Timeout before we close unused backend connections."
) )
PARAM( PARAM_SIMPLE(
/* name */ backend_local_error_holddown, /* name */ backend_local_error_holddown,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -279,7 +286,7 @@ PARAM( ...@@ -279,7 +286,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ backend_remote_error_holddown, /* name */ backend_remote_error_holddown,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -296,7 +303,7 @@ PARAM( ...@@ -296,7 +303,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ cli_limit, /* name */ cli_limit,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "128b", /* min */ "128b",
...@@ -309,7 +316,7 @@ PARAM( ...@@ -309,7 +316,7 @@ PARAM(
"line will indicate the truncation." "line will indicate the truncation."
) )
PARAM( PARAM_SIMPLE(
/* name */ cli_timeout, /* name */ cli_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -321,7 +328,7 @@ PARAM( ...@@ -321,7 +328,7 @@ PARAM(
"mgt_param." "mgt_param."
) )
PARAM( PARAM_SIMPLE(
/* name */ clock_skew, /* name */ clock_skew,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -333,7 +340,7 @@ PARAM( ...@@ -333,7 +340,7 @@ PARAM(
"and our own clock." "and our own clock."
) )
PARAM( PARAM_SIMPLE(
/* name */ clock_step, /* name */ clock_step,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -345,7 +352,7 @@ PARAM( ...@@ -345,7 +352,7 @@ PARAM(
"we panic." "we panic."
) )
PARAM( PARAM_SIMPLE(
/* name */ connect_timeout, /* name */ connect_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -359,7 +366,7 @@ PARAM( ...@@ -359,7 +366,7 @@ PARAM(
"request." "request."
) )
PARAM( PARAM_SIMPLE(
/* name */ critbit_cooloff, /* name */ critbit_cooloff,
/* type */ timeout, /* type */ timeout,
/* min */ "60.000", /* min */ "60.000",
...@@ -372,7 +379,7 @@ PARAM( ...@@ -372,7 +379,7 @@ PARAM(
/* flags */ WIZARD /* flags */ WIZARD
) )
PARAM( PARAM_SIMPLE(
/* name */ default_grace, /* name */ default_grace,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -386,7 +393,7 @@ PARAM( ...@@ -386,7 +393,7 @@ PARAM(
/* flags */ OBJ_STICKY /* flags */ OBJ_STICKY
) )
PARAM( PARAM_SIMPLE(
/* name */ default_keep, /* name */ default_keep,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -401,7 +408,7 @@ PARAM( ...@@ -401,7 +408,7 @@ PARAM(
/* flags */ OBJ_STICKY /* flags */ OBJ_STICKY
) )
PARAM( PARAM_SIMPLE(
/* name */ default_ttl, /* name */ default_ttl,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -414,7 +421,7 @@ PARAM( ...@@ -414,7 +421,7 @@ PARAM(
/* flags */ OBJ_STICKY /* flags */ OBJ_STICKY
) )
PARAM( PARAM_SIMPLE(
/* name */ http1_iovs, /* name */ http1_iovs,
/* type */ uint, /* type */ uint,
/* min */ "5", /* min */ "5",
...@@ -428,7 +435,7 @@ PARAM( ...@@ -428,7 +435,7 @@ PARAM(
/* flags */ WIZARD /* flags */ WIZARD
) )
PARAM( PARAM_SIMPLE(
/* name */ fetch_chunksize, /* name */ fetch_chunksize,
/* type */ bytes, /* type */ bytes,
/* min */ "4k", /* min */ "4k",
...@@ -443,7 +450,7 @@ PARAM( ...@@ -443,7 +450,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ fetch_maxchunksize, /* name */ fetch_maxchunksize,
/* type */ bytes, /* type */ bytes,
/* min */ "64k", /* min */ "64k",
...@@ -456,7 +463,7 @@ PARAM( ...@@ -456,7 +463,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ gzip_buffer, /* name */ gzip_buffer,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "2k", /* min */ "2k",
...@@ -472,7 +479,7 @@ PARAM( ...@@ -472,7 +479,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ gzip_level, /* name */ gzip_level,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -483,7 +490,7 @@ PARAM( ...@@ -483,7 +490,7 @@ PARAM(
"Gzip compression level: 0=debug, 1=fast, 9=best" "Gzip compression level: 0=debug, 1=fast, 9=best"
) )
PARAM( PARAM_SIMPLE(
/* name */ gzip_memlevel, /* name */ gzip_memlevel,
/* type */ uint, /* type */ uint,
/* min */ "1", /* min */ "1",
...@@ -495,7 +502,7 @@ PARAM( ...@@ -495,7 +502,7 @@ PARAM(
"Memory impact is 1=1k, 2=2k, ... 9=256k." "Memory impact is 1=1k, 2=2k, ... 9=256k."
) )
PARAM( PARAM_SIMPLE(
/* name */ http_gzip_support, /* name */ http_gzip_support,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -519,7 +526,7 @@ PARAM( ...@@ -519,7 +526,7 @@ PARAM(
/* XXX: what about the effect on beresp.filters? */ /* XXX: what about the effect on beresp.filters? */
) )
PARAM( PARAM_SIMPLE(
/* name */ http_max_hdr, /* name */ http_max_hdr,
/* type */ uint, /* type */ uint,
/* min */ "32", /* min */ "32",
...@@ -534,7 +541,7 @@ PARAM( ...@@ -534,7 +541,7 @@ PARAM(
"Note that the first line occupies five header lines." "Note that the first line occupies five header lines."
) )
PARAM( PARAM_SIMPLE(
/* name */ http_range_support, /* name */ http_range_support,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -546,7 +553,7 @@ PARAM( ...@@ -546,7 +553,7 @@ PARAM(
/* XXX: what about the effect on beresp.filters? */ /* XXX: what about the effect on beresp.filters? */
) )
PARAM( PARAM_SIMPLE(
/* name */ http_req_hdr_len, /* name */ http_req_hdr_len,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "40b", /* min */ "40b",
...@@ -558,7 +565,7 @@ PARAM( ...@@ -558,7 +565,7 @@ PARAM(
"The limit is inclusive its continuation lines." "The limit is inclusive its continuation lines."
) )
PARAM( PARAM_SIMPLE(
/* name */ http_req_size, /* name */ http_req_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0.25k", /* min */ "0.25k",
...@@ -574,7 +581,7 @@ PARAM( ...@@ -574,7 +581,7 @@ PARAM(
"that the request is allowed to take up." "that the request is allowed to take up."
) )
PARAM( PARAM_SIMPLE(
/* name */ http_resp_hdr_len, /* name */ http_resp_hdr_len,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "40b", /* min */ "40b",
...@@ -586,7 +593,7 @@ PARAM( ...@@ -586,7 +593,7 @@ PARAM(
" The limit is inclusive its continuation lines." " The limit is inclusive its continuation lines."
) )
PARAM( PARAM_SIMPLE(
/* name */ http_resp_size, /* name */ http_resp_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0.25k", /* min */ "0.25k",
...@@ -611,7 +618,7 @@ PARAM( ...@@ -611,7 +618,7 @@ PARAM(
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ idle_send_timeout, /* name */ idle_send_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -628,7 +635,7 @@ PARAM( ...@@ -628,7 +635,7 @@ PARAM(
) )
#undef XYZZY #undef XYZZY
PARAM( PARAM_SIMPLE(
/* name */ listen_depth, /* name */ listen_depth,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -640,7 +647,7 @@ PARAM( ...@@ -640,7 +647,7 @@ PARAM(
/* flags */ MUST_RESTART /* flags */ MUST_RESTART
) )
PARAM( PARAM_SIMPLE(
/* name */ lru_interval, /* name */ lru_interval,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -656,7 +663,7 @@ PARAM( ...@@ -656,7 +663,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ max_esi_depth, /* name */ max_esi_depth,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -667,7 +674,7 @@ PARAM( ...@@ -667,7 +674,7 @@ PARAM(
"Maximum depth of esi:include processing." "Maximum depth of esi:include processing."
) )
PARAM( PARAM_SIMPLE(
/* name */ max_restarts, /* name */ max_restarts,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -678,7 +685,7 @@ PARAM( ...@@ -678,7 +685,7 @@ PARAM(
"Upper limit on how many times a request can restart." "Upper limit on how many times a request can restart."
) )
PARAM( PARAM_SIMPLE(
/* name */ max_retries, /* name */ max_retries,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -689,7 +696,7 @@ PARAM( ...@@ -689,7 +696,7 @@ PARAM(
"Upper limit on how many times a backend fetch can retry." "Upper limit on how many times a backend fetch can retry."
) )
PARAM( PARAM_SIMPLE(
/* name */ nuke_limit, /* name */ nuke_limit,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -702,7 +709,7 @@ PARAM( ...@@ -702,7 +709,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ ping_interval, /* name */ ping_interval,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -716,7 +723,7 @@ PARAM( ...@@ -716,7 +723,7 @@ PARAM(
/* flags */ MUST_RESTART /* flags */ MUST_RESTART
) )
PARAM( PARAM_SIMPLE(
/* name */ pipe_sess_max, /* name */ pipe_sess_max,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -727,7 +734,7 @@ PARAM( ...@@ -727,7 +734,7 @@ PARAM(
"Maximum number of sessions dedicated to pipe transactions." "Maximum number of sessions dedicated to pipe transactions."
) )
PARAM( PARAM_SIMPLE(
/* name */ pipe_timeout, /* name */ pipe_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -739,7 +746,7 @@ PARAM( ...@@ -739,7 +746,7 @@ PARAM(
"either direction for this many seconds, the session is closed." "either direction for this many seconds, the session is closed."
) )
PARAM( PARAM_SIMPLE(
/* name */ prefer_ipv6, /* name */ prefer_ipv6,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -751,7 +758,7 @@ PARAM( ...@@ -751,7 +758,7 @@ PARAM(
"IPv4 and IPv6 addresses." "IPv4 and IPv6 addresses."
) )
PARAM( PARAM_SIMPLE(
/* name */ rush_exponent, /* name */ rush_exponent,
/* type */ uint, /* type */ uint,
/* min */ "2", /* min */ "2",
...@@ -775,7 +782,7 @@ PARAM( ...@@ -775,7 +782,7 @@ PARAM(
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ send_timeout, /* name */ send_timeout,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -793,7 +800,7 @@ PARAM( ...@@ -793,7 +800,7 @@ PARAM(
) )
#undef XYZZY #undef XYZZY
PARAM( PARAM_SIMPLE(
/* name */ shortlived, /* name */ shortlived,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -805,7 +812,7 @@ PARAM( ...@@ -805,7 +812,7 @@ PARAM(
"always put in transient storage." "always put in transient storage."
) )
PARAM( PARAM_SIMPLE(
/* name */ sigsegv_handler, /* name */ sigsegv_handler,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -818,7 +825,7 @@ PARAM( ...@@ -818,7 +825,7 @@ PARAM(
/* flags */ MUST_RESTART /* flags */ MUST_RESTART
) )
PARAM( PARAM_SIMPLE(
/* name */ syslog_cli_traffic, /* name */ syslog_cli_traffic,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -834,7 +841,7 @@ PARAM( ...@@ -834,7 +841,7 @@ PARAM(
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ tcp_fastopen, /* name */ tcp_fastopen,
/* type */ bool, /* type */ bool,
/* min */ NULL, /* min */ NULL,
...@@ -852,7 +859,7 @@ PARAM( ...@@ -852,7 +859,7 @@ PARAM(
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ tcp_keepalive_intvl, /* name */ tcp_keepalive_intvl,
/* type */ timeout, /* type */ timeout,
/* min */ "1", /* min */ "1",
...@@ -868,7 +875,7 @@ PARAM( ...@@ -868,7 +875,7 @@ PARAM(
/* dyn_def_reason */ "platform dependent" /* dyn_def_reason */ "platform dependent"
) )
PARAM( PARAM_SIMPLE(
/* name */ tcp_keepalive_probes, /* name */ tcp_keepalive_probes,
/* type */ uint, /* type */ uint,
/* min */ "1", /* min */ "1",
...@@ -885,7 +892,7 @@ PARAM( ...@@ -885,7 +892,7 @@ PARAM(
/* dyn_def_reason */ "platform dependent" /* dyn_def_reason */ "platform dependent"
) )
PARAM( PARAM_SIMPLE(
/* name */ tcp_keepalive_time, /* name */ tcp_keepalive_time,
/* type */ timeout, /* type */ timeout,
/* min */ "1", /* min */ "1",
...@@ -912,7 +919,7 @@ PARAM( ...@@ -912,7 +919,7 @@ PARAM(
#else #else
#define XYZZY NOT_IMPLEMENTED #define XYZZY NOT_IMPLEMENTED
#endif #endif
PARAM( PARAM_SIMPLE(
/* name */ timeout_idle, /* name */ timeout_idle,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -930,7 +937,7 @@ PARAM( ...@@ -930,7 +937,7 @@ PARAM(
) )
#undef XYZZY #undef XYZZY
PARAM( PARAM_SIMPLE(
/* name */ timeout_linger, /* name */ timeout_linger,
/* type */ timeout, /* type */ timeout,
/* min */ "0.000", /* min */ "0.000",
...@@ -948,7 +955,7 @@ PARAM( ...@@ -948,7 +955,7 @@ PARAM(
/* flags */ EXPERIMENTAL /* flags */ EXPERIMENTAL
) )
PARAM( PARAM_SIMPLE(
/* name */ vcl_cooldown, /* name */ vcl_cooldown,
/* type */ timeout, /* type */ timeout,
/* min */ "1.000", /* min */ "1.000",
...@@ -960,7 +967,7 @@ PARAM( ...@@ -960,7 +967,7 @@ PARAM(
"active VCL (granularity approximately 30 seconds)." "active VCL (granularity approximately 30 seconds)."
) )
PARAM( PARAM_SIMPLE(
/* name */ max_vcl_handling, /* name */ max_vcl_handling,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -974,7 +981,7 @@ PARAM( ...@@ -974,7 +981,7 @@ PARAM(
"\n* 2 - Refuse loading VCLs." "\n* 2 - Refuse loading VCLs."
) )
PARAM( PARAM_SIMPLE(
/* name */ max_vcl, /* name */ max_vcl,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -986,7 +993,7 @@ PARAM( ...@@ -986,7 +993,7 @@ PARAM(
" Parameter max_vcl_handling determines behaviour." " Parameter max_vcl_handling determines behaviour."
) )
PARAM( PARAM_SIMPLE(
/* name */ vsm_free_cooldown, /* name */ vsm_free_cooldown,
/* type */ timeout, /* type */ timeout,
/* min */ "10.000", /* min */ "10.000",
...@@ -998,7 +1005,7 @@ PARAM( ...@@ -998,7 +1005,7 @@ PARAM(
"(granularity approximately 2 seconds)." "(granularity approximately 2 seconds)."
) )
PARAM( PARAM_SIMPLE(
/* name */ vsl_buffer, /* name */ vsl_buffer,
/* type */ vsl_buffer, /* type */ vsl_buffer,
/* min */ "267", /* min */ "267",
...@@ -1017,7 +1024,7 @@ PARAM( ...@@ -1017,7 +1024,7 @@ PARAM(
/* dyn_min_reason */ "vsl_reclen + 12 bytes" /* dyn_min_reason */ "vsl_reclen + 12 bytes"
) )
PARAM( PARAM_SIMPLE(
/* name */ vsl_reclen, /* name */ vsl_reclen,
/* type */ vsl_reclen, /* type */ vsl_reclen,
/* min */ "16b", /* min */ "16b",
...@@ -1031,7 +1038,7 @@ PARAM( ...@@ -1031,7 +1038,7 @@ PARAM(
/* dyn_max_reason */ "vsl_buffer - 12 bytes" /* dyn_max_reason */ "vsl_buffer - 12 bytes"
) )
PARAM( PARAM_SIMPLE(
/* name */ vsl_space, /* name */ vsl_space,
/* type */ bytes, /* type */ bytes,
/* min */ "1M", /* min */ "1M",
...@@ -1046,7 +1053,7 @@ PARAM( ...@@ -1046,7 +1053,7 @@ PARAM(
/* flags */ MUST_RESTART /* flags */ MUST_RESTART
) )
PARAM( PARAM_SIMPLE(
/* name */ vsm_space, /* name */ vsm_space,
/* type */ bytes, /* type */ bytes,
/* min */ "1M", /* min */ "1M",
...@@ -1058,7 +1065,7 @@ PARAM( ...@@ -1058,7 +1065,7 @@ PARAM(
"There is no global limit on amount of shared memory now." "There is no global limit on amount of shared memory now."
) )
PARAM( PARAM_SIMPLE(
/* name */ workspace_backend, /* name */ workspace_backend,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "1k", /* min */ "1k",
...@@ -1071,7 +1078,7 @@ PARAM( ...@@ -1071,7 +1078,7 @@ PARAM(
/* flags */ DELAYED_EFFECT /* flags */ DELAYED_EFFECT
) )
PARAM( PARAM_SIMPLE(
/* name */ workspace_client, /* name */ workspace_client,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "9k", /* min */ "9k",
...@@ -1088,7 +1095,7 @@ PARAM( ...@@ -1088,7 +1095,7 @@ PARAM(
/* flags */ DELAYED_EFFECT /* flags */ DELAYED_EFFECT
) )
PARAM( PARAM_SIMPLE(
/* name */ workspace_session, /* name */ workspace_session,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0.25k", /* min */ "0.25k",
...@@ -1102,7 +1109,7 @@ PARAM( ...@@ -1102,7 +1109,7 @@ PARAM(
/* flags */ DELAYED_EFFECT /* flags */ DELAYED_EFFECT
) )
PARAM( PARAM_SIMPLE(
/* name */ workspace_thread, /* name */ workspace_thread,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0.25k", /* min */ "0.25k",
...@@ -1122,7 +1129,7 @@ PARAM( ...@@ -1122,7 +1129,7 @@ PARAM(
/* flags */ DELAYED_EFFECT /* flags */ DELAYED_EFFECT
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_rx_window_low_water, /* name */ h2_rx_window_low_water,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "65535", /* min */ "65535",
...@@ -1136,7 +1143,7 @@ PARAM( ...@@ -1136,7 +1143,7 @@ PARAM(
/* flags */ WIZARD /* flags */ WIZARD
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_rx_window_increment, /* name */ h2_rx_window_increment,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "1M", /* min */ "1M",
...@@ -1150,7 +1157,7 @@ PARAM( ...@@ -1150,7 +1157,7 @@ PARAM(
/* flags */ WIZARD /* flags */ WIZARD
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_header_table_size, /* name */ h2_header_table_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0b", /* min */ "0b",
...@@ -1163,7 +1170,7 @@ PARAM( ...@@ -1163,7 +1170,7 @@ PARAM(
"decoding table." "decoding table."
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_max_concurrent_streams, /* name */ h2_max_concurrent_streams,
/* type */ uint, /* type */ uint,
/* min */ "0", /* min */ "0",
...@@ -1176,7 +1183,7 @@ PARAM( ...@@ -1176,7 +1183,7 @@ PARAM(
"at the same time for a single HTTP2 connection." "at the same time for a single HTTP2 connection."
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_initial_window_size, /* name */ h2_initial_window_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0", /* min */ "0",
...@@ -1187,7 +1194,7 @@ PARAM( ...@@ -1187,7 +1194,7 @@ PARAM(
"HTTP2 initial flow control window size." "HTTP2 initial flow control window size."
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_max_frame_size, /* name */ h2_max_frame_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "16k", /* min */ "16k",
...@@ -1198,7 +1205,7 @@ PARAM( ...@@ -1198,7 +1205,7 @@ PARAM(
"HTTP2 maximum per frame payload size we are willing to accept." "HTTP2 maximum per frame payload size we are willing to accept."
) )
PARAM( PARAM_SIMPLE(
/* name */ h2_max_header_list_size, /* name */ h2_max_header_list_size,
/* type */ bytes_u, /* type */ bytes_u,
/* min */ "0b", /* min */ "0b",
...@@ -1215,7 +1222,7 @@ PARAM( ...@@ -1215,7 +1222,7 @@ PARAM(
"\tmax_pool\tmaximum size of free pool.\n" \ "\tmax_pool\tmaximum size of free pool.\n" \
"\tmax_age\tmax age of free element." "\tmax_age\tmax age of free element."
PARAM( PARAM_SIMPLE(
/* name */ pool_req, /* name */ pool_req,
/* type */ poolparam, /* type */ poolparam,
/* min */ NULL, /* min */ NULL,
...@@ -1227,7 +1234,7 @@ PARAM( ...@@ -1227,7 +1234,7 @@ PARAM(
MEMPOOL_TEXT MEMPOOL_TEXT
) )
PARAM( PARAM_SIMPLE(
/* name */ pool_sess, /* name */ pool_sess,
/* type */ poolparam, /* type */ poolparam,
/* min */ NULL, /* min */ NULL,
...@@ -1239,7 +1246,7 @@ PARAM( ...@@ -1239,7 +1246,7 @@ PARAM(
MEMPOOL_TEXT MEMPOOL_TEXT
) )
PARAM( PARAM_SIMPLE(
/* name */ pool_vbo, /* name */ pool_vbo,
/* type */ poolparam, /* type */ poolparam,
/* min */ NULL, /* min */ NULL,
...@@ -1630,6 +1637,7 @@ PARAM( ...@@ -1630,6 +1637,7 @@ PARAM(
) )
#endif /* NOT ACTUALLY DEFINED HERE */ #endif /* NOT ACTUALLY DEFINED HERE */
#undef PARAM_SIMPLE
#undef PARAM #undef PARAM
/*lint -restore */ /*lint -restore */
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