h2load: Fix -r does not work without -C option

This commit is contained in:
Tatsuhiro Tsujikawa 2015-08-09 00:24:17 +09:00
parent 846da5fb3f
commit 50eac7bdf0
1 changed files with 3 additions and 2 deletions

View File

@ -1333,7 +1333,8 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (config.is_rate_mode() && config.nconns < (ssize_t)config.nthreads) { if (config.is_rate_mode() && config.nconns != 0 &&
config.nconns < (ssize_t)config.nthreads) {
std::cerr << "-C, -t: the total number of connections must be greater than " std::cerr << "-C, -t: the total number of connections must be greater than "
"or equal " "or equal "
<< "to the number of threads." << std::endl; << "to the number of threads." << std::endl;
@ -1568,7 +1569,7 @@ int main(int argc, char **argv) {
auto nclients_extra_rem_per_thread = 0; auto nclients_extra_rem_per_thread = 0;
// In rate mode, we want each Worker to create a total of // In rate mode, we want each Worker to create a total of
// C/t connections. // C/t connections.
if (config.is_rate_mode()) { if (config.is_rate_mode() && config.nconns > seconds * config.rate) {
nclients_extra = config.nconns - (seconds * config.rate); nclients_extra = config.nconns - (seconds * config.rate);
nclients_extra_per_thread = nclients_extra / (ssize_t)config.nthreads; nclients_extra_per_thread = nclients_extra / (ssize_t)config.nthreads;
nclients_extra_rem_per_thread = nclients_extra_rem_per_thread =