clang-format
This commit is contained in:
parent
c9b1c91944
commit
afcd8d9ab1
|
@ -449,15 +449,15 @@ int Client::make_socket(addrinfo *addr) {
|
|||
int Client::connect() {
|
||||
int rv;
|
||||
|
||||
if (!worker->config->is_timing_based_mode()
|
||||
|| worker->current_phase == Phase::MAIN_DURATION) {
|
||||
if (!worker->config->is_timing_based_mode() ||
|
||||
worker->current_phase == Phase::MAIN_DURATION) {
|
||||
record_client_start_time();
|
||||
clear_connect_times();
|
||||
record_connect_start_time();
|
||||
} else if (worker->current_phase == Phase::INITIAL_IDLE) {
|
||||
worker->current_phase = Phase::WARM_UP;
|
||||
std::cout << "Warm-up started for thread #" << worker->id
|
||||
<< "." << std::endl;
|
||||
std::cout << "Warm-up started for thread #" << worker->id << "."
|
||||
<< std::endl;
|
||||
ev_timer_start(worker->loop, &worker->warmup_watcher);
|
||||
}
|
||||
|
||||
|
@ -646,7 +646,8 @@ void Client::process_request_failure() {
|
|||
if (req_inflight == 0) {
|
||||
terminate_session();
|
||||
}
|
||||
std::cout << "Process Request Failure:" << worker->stats.req_failed << std::endl;
|
||||
std::cout << "Process Request Failure:" << worker->stats.req_failed
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
@ -1384,8 +1385,8 @@ void Worker::sample_client_stat(ClientStat *cstat) {
|
|||
}
|
||||
|
||||
void Worker::report_progress() {
|
||||
if (id != 0 || config->is_rate_mode() || stats.req_done % progress_interval
|
||||
|| config->is_timing_based_mode()) {
|
||||
if (id != 0 || config->is_rate_mode() || stats.req_done % progress_interval ||
|
||||
config->is_timing_based_mode()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1745,8 +1746,8 @@ std::unique_ptr<Worker> create_worker(uint32_t id, SSL_CTX *ssl_ctx,
|
|||
} else {
|
||||
// Here rate is same as client because the rate_timeout callback
|
||||
// will be called only once
|
||||
return make_unique<Worker>(id, ssl_ctx, nreqs, nclients, nclients, max_samples,
|
||||
&config);
|
||||
return make_unique<Worker>(id, ssl_ctx, nreqs, nclients, nclients,
|
||||
max_samples, &config);
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
@ -2029,8 +2030,8 @@ int main(int argc, char **argv) {
|
|||
{"warm-up-time", required_argument, &flag, 9},
|
||||
{nullptr, 0, nullptr, 0}};
|
||||
int option_index = 0;
|
||||
auto c =
|
||||
getopt_long(argc, argv, "hvW:c:d:m:n:p:t:w:H:i:r:T:N:D:B:", long_options,
|
||||
auto c = getopt_long(argc, argv,
|
||||
"hvW:c:d:m:n:p:t:w:H:i:r:T:N:D:B:", long_options,
|
||||
&option_index);
|
||||
if (c == -1) {
|
||||
break;
|
||||
|
@ -2345,8 +2346,7 @@ int main(int argc, char **argv) {
|
|||
|
||||
if (config.nreqs == 0 && !config.is_timing_based_mode()) {
|
||||
std::cerr << "-n: the number of requests must be strictly greater than 0,"
|
||||
<< "timing-based test is not being run."
|
||||
<< std::endl;
|
||||
<< "timing-based test is not being run." << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
|
@ -2369,7 +2369,8 @@ int main(int argc, char **argv) {
|
|||
|
||||
// With timing script, we don't distribute config.nreqs to each
|
||||
// client or thread.
|
||||
if (!config.timing_script && config.nreqs < config.nclients && !config.is_timing_based_mode()) {
|
||||
if (!config.timing_script && config.nreqs < config.nclients &&
|
||||
!config.is_timing_based_mode()) {
|
||||
std::cerr << "-n, -c: the number of requests must be greater than or "
|
||||
<< "equal to the clients." << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
|
@ -2377,16 +2378,14 @@ int main(int argc, char **argv) {
|
|||
|
||||
if (config.nclients < config.nthreads) {
|
||||
std::cerr << "-c, -t: the number of clients must be greater than or equal "
|
||||
<< "to the number of threads."
|
||||
<< std::endl;
|
||||
<< "to the number of threads." << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (config.is_timing_based_mode()) {
|
||||
if (config.nreqs != 0) {
|
||||
std::cerr << "-n: the number of requests needs to be zero (0) for timing-"
|
||||
<< "based test. Default value is 1."
|
||||
<< std::endl;
|
||||
<< "based test. Default value is 1." << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
@ -2741,7 +2740,8 @@ int main(int argc, char **argv) {
|
|||
bps = stats.bytes_total / config.duration;
|
||||
} else {
|
||||
auto secd = std::chrono::duration_cast<
|
||||
std::chrono::duration<double, std::chrono::seconds::period>>(duration);
|
||||
std::chrono::duration<double, std::chrono::seconds::period>>(
|
||||
duration);
|
||||
rps = stats.req_success / secd.count();
|
||||
bps = stats.bytes_total / secd.count();
|
||||
}
|
||||
|
|
|
@ -264,11 +264,13 @@ struct Worker {
|
|||
ev_timer timeout_watcher;
|
||||
// The next client ID this worker assigns
|
||||
uint32_t next_client_id;
|
||||
// Keeps track of the current phase (for timing-based experiment) for the worker
|
||||
// Keeps track of the current phase (for timing-based experiment) for the
|
||||
// worker
|
||||
Phase current_phase;
|
||||
// We need to keep track of the clients in order to stop them when needed
|
||||
std::vector<Client *> clients;
|
||||
// This is only active when there is not a bounded number of requests specified
|
||||
// This is only active when there is not a bounded number of requests
|
||||
// specified
|
||||
ev_timer duration_watcher;
|
||||
ev_timer warmup_watcher;
|
||||
|
||||
|
|
Loading…
Reference in New Issue