Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
95093730
Commit
95093730
authored
Nov 01, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the TCP parameters into the tbl #include
parent
549fdfc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
40 deletions
+11
-40
params.h
bin/varnishd/common/params.h
+0
-6
mgt_param_tcp.c
bin/varnishd/mgt/mgt_param_tcp.c
+0
-23
params.h
include/tbl/params.h
+11
-11
No files found.
bin/varnishd/common/params.h
View file @
95093730
...
...
@@ -101,12 +101,6 @@ struct params {
ssize_t
wthread_stacksize
;
unsigned
wthread_queue_limit
;
#ifdef HAVE_TCP_KEEP
double
tcp_keepalive_time
;
unsigned
tcp_keepalive_probes
;
double
tcp_keepalive_intvl
;
#endif
struct
vre_limits
vre_limits
;
struct
poolparam
req_pool
;
...
...
bin/varnishd/mgt/mgt_param_tcp.c
View file @
95093730
...
...
@@ -51,28 +51,6 @@
#ifdef HAVE_TCP_KEEP
static
struct
parspec
mgt_parspec_tcp_keep
[]
=
{
{
"tcp_keepalive_time"
,
tweak_timeout
,
&
mgt_param
.
tcp_keepalive_time
,
"1"
,
"7200"
,
"The number of seconds a connection needs to be idle before "
"TCP begins sending out keep-alive probes."
,
EXPERIMENTAL
,
""
,
"seconds"
},
{
"tcp_keepalive_probes"
,
tweak_uint
,
&
mgt_param
.
tcp_keepalive_probes
,
"1"
,
"100"
,
"The maximum number of TCP keep-alive probes to send before "
"giving up and killing the connection if no response is "
"obtained from the other end."
,
EXPERIMENTAL
,
""
,
"probes"
},
{
"tcp_keepalive_intvl"
,
tweak_timeout
,
&
mgt_param
.
tcp_keepalive_intvl
,
"1"
,
"100"
,
"The number of seconds between TCP keep-alive probes."
,
EXPERIMENTAL
,
""
,
"seconds"
},
{
NULL
,
NULL
,
NULL
}
};
static
void
tcp_probe
(
int
sock
,
int
nam
,
const
char
*
param
,
unsigned
def
)
{
...
...
@@ -108,7 +86,6 @@ void
MCF_TcpParams
(
void
)
{
#ifdef HAVE_TCP_KEEP
MCF_AddParams
(
mgt_parspec_tcp_keep
);
tcp_keep_probes
();
#endif
}
include/tbl/params.h
View file @
95093730
...
...
@@ -992,14 +992,13 @@ PARAM(
/* func */
NULL
)
#if 0
/* actual location mgt_param_tcp.c */
#if defined(HAVE_TCP_KEEP)
PARAM
(
/* name */
tcp_keepalive_intvl
,
/* typ */
timeout
,
/* min */ "1
.000
",
/* max */ "100
.000
",
/* default */ "
5.000
",
/* min */
"1"
,
/* max */
"100"
,
/* default */
""
,
/* units */
"seconds"
,
/* flags */
EXPERIMENTAL
,
/* s-text */
...
...
@@ -1008,13 +1007,12 @@ PARAM(
/* func */
NULL
)
/* actual location mgt_param_tcp.c */
PARAM
(
/* name */
tcp_keepalive_probes
,
/* typ */
uint
,
/* min */
"1"
,
/* max */
"100"
,
/* default */ "
5
",
/* default */
""
,
/* units */
"probes"
,
/* flags */
EXPERIMENTAL
,
/* s-text */
...
...
@@ -1025,13 +1023,12 @@ PARAM(
/* func */
NULL
)
/* actual location mgt_param_tcp.c */
PARAM
(
/* name */
tcp_keepalive_time
,
/* typ */
timeout
,
/* min */ "1
.000
",
/* max */ "7200
.000
",
/* default */ "
600.000
",
/* min */
"1"
,
/* max */
"7200"
,
/* default */
""
,
/* units */
"seconds"
,
/* flags */
EXPERIMENTAL
,
/* s-text */
...
...
@@ -1041,6 +1038,9 @@ PARAM(
/* func */
NULL
)
#endif
/* HAVE_TCP_KEEP */
#if 0
/* actual location mgt_pool.c */
PARAM(
/* name */ thread_pool_add_delay,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment