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
d36344d3
Commit
d36344d3
authored
Nov 12, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
De-const the parspec structs and modify them directly to avoid
various pointless malloc'ing.
parent
6d0c94c3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
26 deletions
+16
-26
mgt_param.c
bin/varnishd/mgt/mgt_param.c
+10
-20
mgt_param.h
bin/varnishd/mgt/mgt_param.h
+3
-3
mgt_param_bits.c
bin/varnishd/mgt/mgt_param_bits.c
+1
-1
mgt_param_tbl.c
bin/varnishd/mgt/mgt_param_tbl.c
+1
-1
mgt_pool.c
bin/varnishd/mgt/mgt_pool.c
+1
-1
No files found.
bin/varnishd/mgt/mgt_param.c
View file @
d36344d3
...
...
@@ -51,7 +51,7 @@
struct
params
mgt_param
;
static
int
nparspec
;
static
struct
parspec
const
**
parspecs
;
static
struct
parspec
**
parspecs
;
static
const
int
margin1
=
8
;
static
int
margin2
=
0
;
static
const
int
wrap_at
=
72
;
...
...
@@ -89,7 +89,7 @@ static const char PROTECTED_TEXT[] =
/*--------------------------------------------------------------------*/
static
const
struct
parspec
*
static
struct
parspec
*
mcf_findpar
(
const
char
*
name
,
int
*
idx
)
{
int
i
;
...
...
@@ -278,17 +278,14 @@ MCF_ParamProtect(struct cli *cli, const char *args)
return
;
}
for
(
i
=
1
;
av
[
i
]
!=
NULL
;
i
++
)
{
if
(
mcf_findpar
(
av
[
i
],
&
j
)
==
NULL
)
{
pp
=
mcf_findpar
(
av
[
i
],
&
j
);
if
(
pp
==
NULL
)
{
VCLI_Out
(
cli
,
"Unknown parameter %s"
,
av
[
i
]);
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
VAV_Free
(
av
);
return
;
}
pp
=
calloc
(
sizeof
*
pp
,
1L
);
AN
(
pp
);
memcpy
(
pp
,
parspecs
[
j
],
sizeof
*
pp
);
pp
->
flags
|=
PROTECTED
;
parspecs
[
j
]
=
pp
;
}
VAV_Free
(
av
);
}
...
...
@@ -353,9 +350,9 @@ mcf_parspec_cmp(const void *a, const void *b)
}
static
void
MCF_AddParams
(
const
struct
parspec
*
ps
)
MCF_AddParams
(
struct
parspec
*
ps
)
{
const
struct
parspec
*
pp
;
struct
parspec
*
pp
;
const
char
*
s
;
int
n
;
...
...
@@ -437,18 +434,11 @@ MCF_CollectParams(void)
void
MCF_SetDefault
(
const
char
*
param
,
const
char
*
def
)
{
struct
parspec
*
pn
;
int
i
;
struct
parspec
*
pp
;
for
(
i
=
0
;
i
<
nparspec
;
i
++
)
if
(
!
strcmp
(
parspecs
[
i
]
->
name
,
param
))
break
;
assert
(
i
<
nparspec
);
pn
=
malloc
(
sizeof
*
pn
);
AN
(
pn
);
*
pn
=
*
(
parspecs
[
i
]);
pn
->
def
=
def
;
parspecs
[
i
]
=
pn
;
pp
=
mcf_findpar
(
param
,
NULL
);
AN
(
pp
);
pp
->
def
=
def
;
}
/*--------------------------------------------------------------------*/
...
...
bin/varnishd/mgt/mgt_param.h
View file @
d36344d3
...
...
@@ -69,10 +69,10 @@ int tweak_generic_uint(struct vsb *vsb,
volatile
unsigned
*
dest
,
const
char
*
arg
,
unsigned
min
,
unsigned
max
);
/* mgt_param_tbl.c */
extern
const
struct
parspec
mgt_parspec
[];
extern
struct
parspec
mgt_parspec
[];
/* mgt_param_vsl.c */
extern
const
struct
parspec
VSL_parspec
[];
extern
struct
parspec
VSL_parspec
[];
/* mgt_pool.c */
extern
const
struct
parspec
WRK_parspec
[];
extern
struct
parspec
WRK_parspec
[];
bin/varnishd/mgt/mgt_param_bits.c
View file @
d36344d3
...
...
@@ -234,7 +234,7 @@ tweak_feature(struct vsb *vsb, const struct parspec *par, const char *arg)
* The parameter table itself
*/
const
struct
parspec
VSL_parspec
[]
=
{
struct
parspec
VSL_parspec
[]
=
{
{
"vsl_mask"
,
tweak_vsl_mask
,
NULL
,
0
,
0
,
"Mask individual VSL messages from being logged.
\n
"
"
\t
default
\t
Set default value
\n
"
...
...
bin/varnishd/mgt/mgt_param_tbl.c
View file @
d36344d3
...
...
@@ -51,7 +51,7 @@
* XXX: we should generate the relevant section of varnishd.1 from here.
*/
const
struct
parspec
mgt_parspec
[]
=
{
struct
parspec
mgt_parspec
[]
=
{
{
"user"
,
tweak_user
,
NULL
,
0
,
0
,
"The unprivileged user to run as."
,
MUST_RESTART
,
...
...
bin/varnishd/mgt/mgt_pool.c
View file @
d36344d3
...
...
@@ -98,7 +98,7 @@ tweak_thread_pool_max(struct vsb *vsb, const struct parspec *par,
/*--------------------------------------------------------------------*/
const
struct
parspec
WRK_parspec
[]
=
{
struct
parspec
WRK_parspec
[]
=
{
{
"thread_pools"
,
tweak_uint
,
&
mgt_param
.
wthread_pools
,
1
,
UINT_MAX
,
"Number of worker thread pools.
\n
"
...
...
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