Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
7175bb38
Commit
7175bb38
authored
Apr 16, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the -w argument, -p should be used instead.
parent
8bc9a680
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
58 deletions
+2
-58
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+1
-57
v00006.vtc
bin/varnishtest/tests/v00006.vtc
+1
-1
No files found.
bin/varnishd/mgt/mgt_main.c
View file @
7175bb38
...
...
@@ -100,20 +100,6 @@ pick(const struct choice *cp, const char *which, const char *kind)
/*--------------------------------------------------------------------*/
static
unsigned
long
arg_ul
(
const
char
*
p
)
{
char
*
q
;
unsigned
long
ul
;
ul
=
strtoul
(
p
,
&
q
,
0
);
if
(
*
q
!=
'\0'
)
ARGV_ERR
(
"Invalid number:
\"
%s
\"\n
"
,
p
);
return
(
ul
);
}
/*--------------------------------------------------------------------*/
static
void
usage
(
void
)
{
...
...
@@ -160,52 +146,11 @@ usage(void)
fprintf
(
stderr
,
FMT
,
"-T address:port"
,
"Telnet listen address and port"
);
fprintf
(
stderr
,
FMT
,
"-V"
,
"version"
);
fprintf
(
stderr
,
FMT
,
"-w int[,int[,int]]"
,
"Number of worker threads"
);
fprintf
(
stderr
,
FMT
,
""
,
" -w <fixed_count>"
);
fprintf
(
stderr
,
FMT
,
""
,
" -w min,max"
);
fprintf
(
stderr
,
FMT
,
""
,
" -w min,max,timeout [default: -w2,500,300]"
);
fprintf
(
stderr
,
FMT
,
"-u user"
,
"Priviledge separation user id"
);
#undef FMT
exit
(
1
);
}
/*--------------------------------------------------------------------*/
static
void
tackle_warg
(
const
char
*
argv
)
{
char
**
av
;
unsigned
int
u
;
av
=
VAV_Parse
(
argv
,
NULL
,
ARGV_COMMA
);
AN
(
av
);
if
(
av
[
0
]
!=
NULL
)
ARGV_ERR
(
"%s
\n
"
,
av
[
0
]);
if
(
av
[
1
]
==
NULL
)
usage
();
u
=
arg_ul
(
av
[
1
]);
if
(
u
<
1
)
usage
();
mgt_param
.
wthread_max
=
mgt_param
.
wthread_min
=
u
;
if
(
av
[
2
]
!=
NULL
)
{
u
=
arg_ul
(
av
[
2
]);
if
(
u
<
mgt_param
.
wthread_min
)
usage
();
mgt_param
.
wthread_max
=
u
;
if
(
av
[
3
]
!=
NULL
)
{
u
=
arg_ul
(
av
[
3
]);
mgt_param
.
wthread_timeout
=
u
;
}
}
VAV_Free
(
av
);
}
/*--------------------------------------------------------------------*/
static
void
...
...
@@ -516,8 +461,7 @@ main(int argc, char * const *argv)
usage
();
break
;
case
'w'
:
tackle_warg
(
optarg
);
break
;
ARGV_ERR
(
"-w has been removed, use -p instead
\n
"
);
default:
usage
();
}
...
...
bin/varnishtest/tests/v00006.vtc
View file @
7175bb38
...
...
@@ -8,7 +8,7 @@ server s1 {
} -start
# Only one pool, to avoid getting more than one work thread
varnish v1 -arg "-p thread_pools=1
-w1,1,300
" -vcl+backend {
varnish v1 -arg "-p thread_pools=1" -vcl+backend {
} -start
client c1 {
...
...
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