h2load: Remove "auto" for -m option

Because http/1.1 support, default "auto" behaviour of -m option is not
desirable, since it is used as HTTP pipelining, and it is not used in
practice.
This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-06 23:16:53 +09:00
parent 13bd566eb7
commit acac5ec6ea
1 changed files with 6 additions and 14 deletions

View File

@ -1538,10 +1538,11 @@ Options:
URIs, if present, are ignored. Those in the first URI URIs, if present, are ignored. Those in the first URI
are used solely. Definition of a base URI overrides all are used solely. Definition of a base URI overrides all
scheme, host or port values. scheme, host or port values.
-m, --max-concurrent-streams=(auto|<N>) -m, --max-concurrent-streams=<N>
Max concurrent streams to issue per session. If "auto" Max concurrent streams to issue per session. When
is given, the number of given URIs is used. http/1.1 is used, this specifies the number of HTTP
Default: auto pipelining requests in-flight.
Default: 1
-w, --window-bits=<N> -w, --window-bits=<N>
Sets the stream level initial window size to (2**<N>)-1. Sets the stream level initial window size to (2**<N>)-1.
For SPDY, 2**<N> is used instead. For SPDY, 2**<N> is used instead.
@ -1716,11 +1717,7 @@ int main(int argc, char **argv) {
#endif // NOTHREADS #endif // NOTHREADS
break; break;
case 'm': case 'm':
if (util::strieq("auto", optarg)) { config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
config.max_concurrent_streams = -1;
} else {
config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
}
break; break;
case 'w': case 'w':
case 'W': { case 'W': {
@ -1943,11 +1940,6 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (config.max_concurrent_streams == -1) {
config.max_concurrent_streams = reqlines.size();
}
assert(config.max_concurrent_streams > 0);
if (config.nreqs == 0) { if (config.nreqs == 0) {
std::cerr << "-n: the number of requests must be strictly greater than 0." std::cerr << "-n: the number of requests must be strictly greater than 0."
<< std::endl; << std::endl;