Skip to content

V
varnish-cache
Commit 70de08d2 authored by Federico G. Schwindt's avatar Federico G. Schwindt
Browse files
Options

First pass at using PARAM

parent e6321479
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 506 deletions
bin/varnishd/common/params.h
View file @ 70de08d2
......@@ -88,18 +88,6 @@ struct params {
uid_t uid;
gid_t gid;
/* TTL used for lack of anything better */
double default_ttl;
/* Default grace period */
double default_grace;
/* Default keep period */
double default_keep;
/* Maximum concurrent sessions */
unsigned max_sess;
/* Worker threads and pool */
unsigned wthread_min;
unsigned wthread_max;
......@@ -112,97 +100,14 @@ struct params {
ssize_t wthread_stacksize;
unsigned wthread_queue_limit;
/* Memory allocation hints */
unsigned workspace_backend;
unsigned workspace_client;
unsigned workspace_session;
unsigned workspace_thread;
unsigned vsl_buffer;
unsigned http_req_size;
unsigned http_req_hdr_len;
unsigned http_resp_size;
unsigned http_resp_hdr_len;
unsigned http_max_hdr;
unsigned vsl_reclen;
double timeout_linger;
double timeout_idle;
double pipe_timeout;
double send_timeout;
double idle_send_timeout;
#ifdef HAVE_TCP_KEEP
double tcp_keepalive_time;
unsigned tcp_keepalive_probes;
double tcp_keepalive_intvl;
#endif
/* Fetcher hints */
ssize_t fetch_chunksize;
ssize_t fetch_maxchunksize;
unsigned nuke_limit;
/* Listen depth */
unsigned listen_depth;
/* CLI related */
double cli_timeout;
unsigned cli_limit;
unsigned ping_interval;
/* LRU list ordering interval */
double lru_interval;
/* Maximum restarts allowed */
unsigned max_restarts;
/* Maximum backend retriesallowed */
unsigned max_retries;
/* Maximum esi:include depth allowed */
unsigned max_esi_depth;
/* Rush exponent */
unsigned rush_exponent;
/* Default connection_timeout */
double connect_timeout;
/* CLI buffer size */
unsigned cli_buffer;
/* Prefer IPv6 connections to backend*/
unsigned prefer_ipv6;
/* Acceptable clockskew with backends */
unsigned clock_skew;
unsigned syslog_cli_traffic;
unsigned http_range_support;
unsigned http_gzip_support;
unsigned gzip_buffer;
unsigned gzip_level;
unsigned gzip_memlevel;
double critbit_cooloff;
double vcl_cooldown;
double shortlived;
struct vre_limits vre_limits;
/* Install a SIGSEGV handler */
unsigned sigsegv_handler;
/* VSM dimensions */
ssize_t vsm_space;
ssize_t vsl_space;
struct poolparam req_pool;
struct poolparam sess_pool;
struct poolparam vbo_pool;
......
bin/varnishd/mgt/mgt_param_tbl.c
View file @ 70de08d2
......@@ -48,231 +48,6 @@ struct parspec mgt_parspec[] = {
#include "tbl/params.h"
#undef PARAM
{ "default_ttl", tweak_timeout, &mgt_param.default_ttl,
"0", NULL,
"The TTL assigned to objects if neither the backend nor "
"the VCL code assigns one.",
OBJ_STICKY,
"120", "seconds" },
{ "default_grace", tweak_timeout, &mgt_param.default_grace,
"0", NULL,
"Default grace period. We will deliver an object "
"this long after it has expired, provided another thread "
"is attempting to get a new copy.",
OBJ_STICKY,
"10", "seconds" },
{ "default_keep", tweak_timeout, &mgt_param.default_keep,
"0", NULL,
"Default keep period. We will keep a useless object "
"around this long, making it available for conditional "
"backend fetches. "
"That means that the object will be removed from the "
"cache at the end of ttl+grace+keep.",
OBJ_STICKY,
"0", "seconds" },
{ "workspace_session",
tweak_bytes_u, &mgt_param.workspace_session,
"256", NULL,
"Allocation size for session structure and workspace. "
" The workspace is primarily used for TCP connection "
"addresses."
" If larger than 4k, use a multiple of 4k for VM efficiency.",
DELAYED_EFFECT,
"512", "bytes" },
{ "workspace_client",
tweak_bytes_u, &mgt_param.workspace_client,
"9k", NULL,
"Bytes of HTTP protocol workspace for clients HTTP req/resp."
" If larger than 4k, use a multiple of 4k for VM efficiency.",
DELAYED_EFFECT,
"64k", "bytes" },
{ "workspace_backend",
tweak_bytes_u, &mgt_param.workspace_backend,
"1024", NULL,
"Bytes of HTTP protocol workspace for backend HTTP req/resp."
" If larger than 4k, use a multiple of 4k for VM efficiency.",
DELAYED_EFFECT,
"64k", "bytes" },
{ "workspace_thread",
tweak_bytes_u, &mgt_param.workspace_thread,
"256", "8192",
"Bytes of auxiliary workspace per thread.\n"
"This workspace is used for certain temporary data structures"
" during the operation of a worker thread.\n"
"One use is for the io-vectors for writing requests and"
" responses to sockets, having too little space will"
" result in more writev(2) system calls, having too much"
" just wastes the space.",
DELAYED_EFFECT,
"2048", "bytes" },
{ "http_req_hdr_len",
tweak_bytes_u, &mgt_param.http_req_hdr_len,
"40", NULL,
"Maximum length of any HTTP client request header we will "
"allow. The limit is inclusive its continuation lines.",
0,
"8k", "bytes" },
{ "http_req_size",
tweak_bytes_u, &mgt_param.http_req_size,
"256", NULL,
"Maximum number of bytes of HTTP client request we will deal "
"with. This is a limit on all bytes up to the double blank "
"line which ends the HTTP request.\n"
"The memory for the request is allocated from the client "
"workspace (param: workspace_client) and this parameter limits "
"how much of that the request is allowed to take up.",
0,
"32k", "bytes" },
{ "http_resp_hdr_len",
tweak_bytes_u, &mgt_param.http_resp_hdr_len,
"40", NULL,
"Maximum length of any HTTP backend response header we will "
"allow. The limit is inclusive its continuation lines.",
0,
"8k", "bytes" },
{ "http_resp_size",
tweak_bytes_u, &mgt_param.http_resp_size,
"256", NULL,
"Maximum number of bytes of HTTP backend response we will deal "
"with. This is a limit on all bytes up to the double blank "
"line which ends the HTTP request.\n"
"The memory for the request is allocated from the worker "
"workspace (param: thread_pool_workspace) and this parameter "
"limits how much of that the request is allowed to take up.",
0,
"32k", "bytes" },
{ "http_max_hdr", tweak_uint, &mgt_param.http_max_hdr,
"32", "65535",
"Maximum number of HTTP header lines we allow in "
"{req|resp|bereq|beresp}.http "
"(obj.http is autosized to the exact number of headers).\n"
"Cheap, ~20 bytes, in terms of workspace memory.\n"
"Note that the first line occupies five header lines.",
0,
"64", "header lines" },
{ "vsl_buffer",
tweak_vsl_buffer, &mgt_param.vsl_buffer,
"1024", NULL,
"Bytes of (req-/backend-)workspace dedicated to buffering"
" VSL records.\n"
"Setting this too high costs memory, setting it too low"
" will cause more VSL flushes and likely increase"
" lock-contention on the VSL mutex.\n\n"
"The minimum tracks the vsl_reclen parameter + 12 bytes.",
0,
"4k", "bytes" },
{ "vsl_reclen",
tweak_vsl_reclen, &mgt_param.vsl_reclen,
"16", "65535",
"Maximum number of bytes in SHM log record.\n\n"
"The maximum tracks the vsl_buffer parameter - 12 bytes.",
0,
"255", "bytes" },
{ "shm_reclen",
tweak_vsl_reclen, &mgt_param.vsl_reclen,
"16", "65535",
"Old name for vsl_reclen, use that instead.",
0,
"255", "bytes" },
{ "timeout_idle", tweak_timeout, &mgt_param.timeout_idle,
"0", NULL,
"Idle timeout for client connections.\n"
"A connection is considered idle, until we have "
"received the full request headers.",
0,
"5", "seconds" },
{ "pipe_timeout", tweak_timeout, &mgt_param.pipe_timeout,
"0", NULL,
"Idle timeout for PIPE sessions. "
"If nothing have been received in either direction for "
"this many seconds, the session is closed.",
0,
"60", "seconds" },
{ "send_timeout", tweak_timeout, &mgt_param.send_timeout,
"0", NULL,
"Send timeout for client connections. "
"If the HTTP response hasn't been transmitted in this many\n"
"seconds the session is closed.\n"
"See setsockopt(2) under SO_SNDTIMEO for more information.",
DELAYED_EFFECT,
"600", "seconds" },
{ "idle_send_timeout", tweak_timeout, &mgt_param.idle_send_timeout,
"0", NULL,
"Time to wait with no data sent. "
"If no data has been transmitted in this many\n"
"seconds the session is closed.\n"
"See setsockopt(2) under SO_SNDTIMEO for more information.",
DELAYED_EFFECT,
"60", "seconds" },
{ "nuke_limit",
tweak_uint, &mgt_param.nuke_limit,
"0", NULL,
"Maximum number of objects we attempt to nuke in order "
"to make space for a object body.",
EXPERIMENTAL,
"50", "allocations" },
{ "fetch_chunksize",
tweak_bytes, &mgt_param.fetch_chunksize,
"4096", NULL,
"The default chunksize used by fetcher. "
"This should be bigger than the majority of objects with "
"short TTLs.\n"
"Internal limits in the storage_file module makes increases "
"above 128kb a dubious idea.",
EXPERIMENTAL,
"16k", "bytes" },
{ "fetch_maxchunksize",
tweak_bytes, &mgt_param.fetch_maxchunksize,
"65536", NULL,
"The maximum chunksize we attempt to allocate from storage. "
"Making this too large may cause delays and storage "
"fragmentation.",
EXPERIMENTAL,
"256m", "bytes" },
{ "listen_depth", tweak_uint, &mgt_param.listen_depth,
"0", NULL,
"Listen queue depth.",
MUST_RESTART,
"1024", "connections" },
{ "cli_buffer",
tweak_bytes_u, &mgt_param.cli_buffer,
"4096", NULL,
"Size of buffer for CLI command input."
"\nYou may need to increase this if you have big VCL files "
"and use the vcl.inline CLI command.\n"
"NB: Must be specified with -p to have effect.",
0,
"8k", "bytes" },
{ "cli_limit",
tweak_bytes_u, &mgt_param.cli_limit,
"128", "99999999",
"Maximum size of CLI response. If the response exceeds"
" this limit, the response code will be 201 instead of"
" 200 and the last line will indicate the truncation.",
0,
"48k", "bytes" },
{ "cli_timeout", tweak_timeout, &mgt_param.cli_timeout,
"0", NULL,
"Timeout for the childs replies to CLI requests from "
"the mgt_param.",
0,
"60", "seconds" },
{ "ping_interval", tweak_uint, &mgt_param.ping_interval,
"0", NULL,
"Interval between pings from parent to child.\n"
"Zero will disable pinging entirely, which makes "
"it possible to attach a debugger to the child.",
MUST_RESTART,
"3", "seconds" },
{ "lru_interval", tweak_timeout, &mgt_param.lru_interval,
"0", NULL,
"Grace period before object moves on LRU list.\n"
"Objects are only moved to the front of the LRU "
"list if they have not been moved there already inside "
"this timeout period. This reduces the amount of lock "
"operations necessary for LRU list access.",
EXPERIMENTAL,
"2", "seconds" },
{ "cc_command", tweak_string, &mgt_cc_cmd,
NULL, NULL,
"Command used for compiling the C source code to a "
......@@ -281,134 +56,6 @@ struct parspec mgt_parspec[] = {
"and %o will be replaced with the output file name.",
MUST_RELOAD,
VCC_CC , NULL },
{ "max_restarts", tweak_uint, &mgt_param.max_restarts,
"0", NULL,
"Upper limit on how many times a request can restart."
"\nBe aware that restarts are likely to cause a hit against "
"the backend, so don't increase thoughtlessly.",
0,
"4", "restarts" },
{ "max_retries", tweak_uint, &mgt_param.max_retries,
"0", NULL,
"Upper limit on how many times a backend fetch can retry.",
0,
"4", "retries" },
{ "max_esi_depth", tweak_uint, &mgt_param.max_esi_depth,
"0", NULL,
"Maximum depth of esi:include processing.",
0,
"5", "levels" },
{ "connect_timeout", tweak_timeout, &mgt_param.connect_timeout,
"0", NULL,
"Default connection timeout for backend connections. "
"We only try to connect to the backend for this many "
"seconds before giving up. "
"VCL can override this default value for each backend and "
"backend request.",
0,
"3.5", "seconds" },
{ "clock_skew", tweak_uint, &mgt_param.clock_skew,
"0", NULL,
"How much clockskew we are willing to accept between the "
"backend and our own clock.",
0,
"10", "seconds" },
{ "prefer_ipv6", tweak_bool, &mgt_param.prefer_ipv6,
NULL, NULL,
"Prefer IPv6 address when connecting to backends which "
"have both IPv4 and IPv6 addresses.",
0,
"off", "bool" },
{ "session_max", tweak_uint,
&mgt_param.max_sess,
"1000", NULL,
"Maximum number of sessions we will allocate from one pool "
"before just dropping connections.\n"
"This is mostly an anti-DoS measure, and setting it plenty "
"high should not hurt, as long as you have the memory for "
"it.",
0,
"100000", "sessions" },
{ "timeout_linger", tweak_timeout, &mgt_param.timeout_linger,
"0", NULL,
"How long the worker thread lingers on an idle session "
"before handing it over to the waiter.\n"
"When sessions are reused, as much as half of all reuses "
"happen within the first 100 msec of the previous request "
"completing.\n"
"Setting this too high results in worker threads not doing "
"anything for their keep, setting it too low just means that "
"more sessions take a detour around the waiter.",
EXPERIMENTAL,
"0.050", "seconds" },
{ "syslog_cli_traffic", tweak_bool, &mgt_param.syslog_cli_traffic,
NULL, NULL,
"Log all CLI traffic to syslog(LOG_INFO).",
0,
"on", "bool" },
{ "http_range_support", tweak_bool, &mgt_param.http_range_support,
NULL, NULL,
"Enable support for HTTP Range headers.",
0,
"on", "bool" },
{ "http_gzip_support", tweak_bool, &mgt_param.http_gzip_support,
NULL, NULL,
"Enable gzip support. When enabled Varnish request compressed "
"objects from the backend and store them compressed. "
"If a client does not support gzip encoding Varnish will "
"uncompress compressed objects on demand. Varnish will also "
"rewrite the Accept-Encoding header of clients indicating "
"support for gzip to:\n"
" Accept-Encoding: gzip\n\n"
"Clients that do not support gzip will have their "
"Accept-Encoding header removed. For more information on how "
"gzip is implemented please see the chapter on gzip in the "
"Varnish reference.",
0,
"on", "bool" },
{ "gzip_level", tweak_uint, &mgt_param.gzip_level,
"0", "9",
"Gzip compression level: 0=debug, 1=fast, 9=best",
0,
"6", ""},
{ "gzip_memlevel", tweak_uint, &mgt_param.gzip_memlevel,
"1", "9",
"Gzip memory level 1=slow/least, 9=fast/most compression.\n"
"Memory impact is 1=1k, 2=2k, ... 9=256k.",
0,
"8", ""},
{ "gzip_buffer",
tweak_bytes_u, &mgt_param.gzip_buffer,
"2048", NULL,
"Size of malloc buffer used for gzip processing.\n"
"These buffers are used for in-transit data,"
" for instance gunzip'ed data being sent to a client."
"Making this space to small results in more overhead,"
" writes to sockets etc, making it too big is probably"
" just a waste of memory.",
EXPERIMENTAL,
"32k", "bytes" },
{ "shortlived", tweak_timeout,
&mgt_param.shortlived,
"0", NULL,
"Objects created with (ttl+grace+keep) shorter than this"
" are always put in transient storage.",
0,
"10", "seconds" },
{ "critbit_cooloff", tweak_timeout,
&mgt_param.critbit_cooloff,
"60", "254",
"How long the critbit hasher keeps deleted objheads "
"on the cooloff list.",
WIZARD,
"180", "seconds" },
{ "sigsegv_handler", tweak_bool, &mgt_param.sigsegv_handler,
NULL, NULL,
"Install a signal handler which tries to dump debug"
" information on segmentation faults, bus errors and abort"
" signals.",
MUST_RESTART,
"on", "bool" },
{ "vcl_dir", tweak_string, &mgt_vcl_dir,
NULL, NULL,
"Directory from which relative VCL filenames (vcl.load and "
......@@ -422,31 +69,22 @@ struct parspec mgt_parspec[] = {
0,
VARNISH_VMOD_DIR,
NULL },
{ "vcl_cooldown", tweak_timeout, &mgt_param.vcl_cooldown,
"0", NULL,
"How long a VCL is kept warm after being replaced as the"
" active VCL (granularity approximately 30 seconds).",
0,
"600", "seconds" },
{ "vcc_err_unref", tweak_bool, &mgt_vcc_err_unref,
NULL, NULL,
"Unreferenced VCL objects result in error.",
0,
"on", "bool" },
{ "vcc_allow_inline_c", tweak_bool, &mgt_vcc_allow_inline_c,
NULL, NULL,
"Allow inline C code in VCL.",
0,
"off", "bool" },
{ "vcc_unsafe_path", tweak_bool, &mgt_vcc_unsafe_path,
NULL, NULL,
"Allow '/' in vmod & include paths.\n"
"Allow 'import ... from ...'.",
0,
"on", "bool" },
{ "pcre_match_limit", tweak_uint,
&mgt_param.vre_limits.match,
"1", NULL,
......@@ -473,28 +111,6 @@ struct parspec mgt_parspec[] = {
"Testcase r01576 can be useful when tuning this parameter.",
0,
"20", ""},
{ "vsl_space", tweak_bytes,
&mgt_param.vsl_space,
"1M", NULL,
"The amount of space to allocate for the VSL fifo buffer"
" in the VSM memory segment."
" If you make this too small, varnish{ncsa|log} etc will"
" not be able to keep up."
" Making it too large just costs memory resources.",
MUST_RESTART,
"80M", "bytes"},
{ "vsm_space", tweak_bytes,
&mgt_param.vsm_space,
"1M", NULL,
"The amount of space to allocate for stats counters"
" in the VSM memory segment."
" If you make this too small, some counters will be"
" invisible."
" Making it too large just costs memory resources.",
MUST_RESTART,
"1M", "bytes"},
{ "pool_req", tweak_poolparam, &mgt_param.req_pool,
NULL, NULL,
"Parameters for per worker pool request memory pool.\n"
......
bin/varnishd/mgt/mgt_pool.c
View file @ 70de08d2
......@@ -191,15 +191,6 @@ struct parspec WRK_parspec[] = {
"be dropped instead of queued.",
EXPERIMENTAL,
"20", "" },
{ "rush_exponent", tweak_uint, &mgt_param.rush_exponent,
"2", NULL,
"How many parked request we start for each completed "
"request on the object.\n"
"NB: Even with the implict delay of delivery, "
"this parameter controls an exponential increase in "
"number of worker threads.",
EXPERIMENTAL,
"3", "requests per request" },
{ "thread_pool_stack",
tweak_bytes, &mgt_param.wthread_stacksize,
NULL, NULL,
......
include/tbl/params.h
View file @ 70de08d2
......@@ -226,9 +226,6 @@ PARAM(
/* func */ NULL
)
/**********************************************************************/
#if 0 /* NOT YET */
PARAM(
/* name */ cli_buffer,
/* typ */ bytes_u,
......@@ -245,6 +242,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ cli_limit,
/* typ */ bytes_u,
......@@ -260,6 +258,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ cli_timeout,
/* typ */ timeout,
......@@ -274,6 +273,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ clock_skew,
/* typ */ uint,
......@@ -288,6 +288,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ connect_timeout,
/* typ */ timeout,
......@@ -304,6 +305,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ critbit_cooloff,
/* typ */ timeout,
......@@ -318,6 +320,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ debug,
......@@ -347,6 +350,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ default_grace,
/* typ */ timeout,
......@@ -362,6 +366,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ default_keep,
/* typ */ timeout,
......@@ -378,6 +383,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ default_ttl,
/* typ */ timeout,
......@@ -392,6 +398,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ feature,
......@@ -417,6 +424,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ fetch_chunksize,
/* typ */ bytes,
......@@ -433,6 +441,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ fetch_maxchunksize,
/* typ */ bytes,
......@@ -447,6 +456,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ gzip_buffer,
/* typ */ bytes_u,
......@@ -464,6 +474,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ gzip_level,
/* typ */ uint,
......@@ -477,6 +488,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ gzip_memlevel,
/* typ */ uint,
......@@ -491,6 +503,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_gzip_support,
/* typ */ bool,
......@@ -513,6 +526,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_max_hdr,
/* typ */ uint,
......@@ -530,6 +544,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_range_support,
/* typ */ bool,
......@@ -543,6 +558,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_req_hdr_len,
/* typ */ bytes_u,
......@@ -557,6 +573,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_req_size,
/* typ */ bytes_u,
......@@ -575,6 +592,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_resp_hdr_len,
/* typ */ bytes_u,
......@@ -589,6 +607,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ http_resp_size,
/* typ */ bytes_u,
......@@ -607,6 +626,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ idle_send_timeout,
/* typ */ timeout,
......@@ -623,6 +643,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ listen_depth,
/* typ */ uint,
......@@ -636,6 +657,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ lru_interval,
/* typ */ timeout,
......@@ -653,6 +675,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ max_esi_depth,
/* typ */ uint,
......@@ -666,6 +689,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ max_restarts,
/* typ */ uint,
......@@ -681,6 +705,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ max_retries,
/* typ */ uint,
......@@ -694,6 +719,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ nuke_limit,
/* typ */ uint,
......@@ -708,6 +734,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ pcre_match_limit,
......@@ -723,6 +750,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ pcre_match_limit_recursion,
/* typ */ uint,
......@@ -738,6 +766,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ ping_interval,
/* typ */ uint,
......@@ -753,6 +782,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ pipe_timeout,
/* typ */ timeout,
......@@ -767,6 +797,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ pool_req,
......@@ -782,6 +813,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ pool_sess,
/* typ */ poolparam,
......@@ -796,6 +828,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ pool_vbo,
/* typ */ poolparam,
......@@ -811,6 +844,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ prefer_ipv6,
/* typ */ bool,
......@@ -825,6 +859,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ rush_exponent,
/* typ */ uint,
......@@ -841,6 +876,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ send_timeout,
/* typ */ timeout,
......@@ -857,13 +893,13 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ session_max,
/* typ */ uint,
/* min */ "1000",
/* max */ NULL,
/* default */ "10.000",
/* default */ "100000",
/* units */ "sessions",
/* flags */ 0,
/* s-text */
......@@ -888,7 +924,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#endif
PARAM(
/* name */ shortlived,
/* typ */ timeout,
......@@ -903,6 +939,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ sigsegv_handler,
/* typ */ bool,
......@@ -917,6 +954,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ syslog_cli_traffic,
/* typ */ bool,
......@@ -930,6 +968,8 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ tcp_keepalive_intvl,
/* typ */ timeout,
......@@ -943,6 +983,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ tcp_keepalive_probes,
/* typ */ uint,
......@@ -958,6 +999,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ tcp_keepalive_time,
/* typ */ timeout,
......@@ -972,7 +1014,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ thread_pool_add_delay,
/* typ */ timeout,
......@@ -992,6 +1034,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_destroy_delay,
/* typ */ timeout,
......@@ -1006,6 +1049,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_fail_delay,
/* typ */ timeout,
......@@ -1031,6 +1075,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_max,
/* typ */ thread_pool_max,
......@@ -1048,6 +1093,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_min,
/* typ */ thread_pool_min,
......@@ -1065,6 +1111,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_stack,
/* typ */ bytes,
......@@ -1080,6 +1127,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pool_timeout,
/* typ */ timeout,
......@@ -1096,6 +1144,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_pools,
/* typ */ uint,
......@@ -1117,6 +1166,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_queue_limit,
/* typ */ uint,
......@@ -1134,6 +1184,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ thread_stats_rate,
/* typ */ uint,
......@@ -1145,7 +1196,7 @@ PARAM(
/* s-text */
"Worker threads accumulate statistics, and dump these into the "
"global stats counters if the lock is free when they finish a job "
"(request/fetch etc.)\n"
"(request/fetch etc).\n"
"This parameters defines the maximum number of jobs a worker "
"thread may handle, before it is forced to dump its accumulated "
"stats into the global counters.",
......@@ -1153,6 +1204,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ timeout_idle,
/* typ */ timeout,
......@@ -1168,6 +1220,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ timeout_linger,
/* typ */ timeout,
......@@ -1187,6 +1240,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ vcc_allow_inline_c,
......@@ -1201,8 +1255,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#endif
#if 0
PARAM(
/* name */ vcc_err_unref,
/* typ */ bool,
......@@ -1216,8 +1269,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#endif
#if 0
PARAM(
/* name */ vcc_unsafe_path,
/* typ */ bool,
......@@ -1233,6 +1285,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ vcl_cooldown,
/* typ */ timeout,
......@@ -1242,11 +1295,12 @@ PARAM(
/* units */ "seconds",
/* flags */ 0,
/* s-text */
"How long time a VCL is kept warm after being replaced as the "
"active VCL. (Granularity approximately 30 seconds.)",
"How long a VCL is kept warm after being replaced as the "
"active VCL (granularity approximately 30 seconds).",
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ vcl_dir,
......@@ -1262,6 +1316,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ vmod_dir,
/* typ */ string,
......@@ -1276,6 +1331,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ vsl_buffer,
/* typ */ vsl_buffer,
......@@ -1289,11 +1345,12 @@ PARAM(
"records.\n"
"Setting this too high costs memory, setting it too low will cause "
"more VSL flushes and likely increase lock-contention on the VSL "
"mutex.\n"
"mutex.\n\n"
"The minimum tracks the vsl_reclen parameter + 12 bytes.",
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ vsl_mask,
......@@ -1307,12 +1364,13 @@ PARAM(
"Mask individual VSL messages from being logged.\n"
" default Set default value\n"
"\n"
"Use +/- prefixe in front of VSL tag name, to mask/unmask "
"Use +/- prefix in front of VSL tag name, to mask/unmask "
"individual VSL messages.",
/* l-text */ "",
/* func */ NULL
)
#endif
PARAM(
/* name */ vsl_reclen,
/* typ */ vsl_reclen,
......@@ -1322,11 +1380,12 @@ PARAM(
/* units */ "bytes",
/* flags */ 0,
/* s-text */
"Maximum number of bytes in SHM log record.\n"
"Maximum number of bytes in SHM log record.\n\n"
"The maximum tracks the vsl_buffer parameter - 12 bytes.",
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ vsl_space,
/* typ */ bytes,
......@@ -1343,6 +1402,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ vsm_space,
/* typ */ bytes,
......@@ -1358,6 +1418,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#if 0
PARAM(
/* name */ waiter,
......@@ -1373,6 +1434,7 @@ PARAM(
/* func */ NULL
)
#endif
PARAM(
/* name */ workspace_backend,
/* typ */ bytes_u,
......@@ -1387,6 +1449,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ workspace_client,
/* typ */ bytes_u,
......@@ -1401,6 +1464,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ workspace_session,
/* typ */ bytes_u,
......@@ -1416,6 +1480,7 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
PARAM(
/* name */ workspace_thread,
/* typ */ bytes_u,
......@@ -1434,5 +1499,5 @@ PARAM(
/* l-text */ "",
/* func */ NULL
)
#endif
/*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