walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

h2load: Delete Client when it finished

This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-05 23:25:09 +09:00
parent 60bbb5cae0
commit 7ed26afe75
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/h2load.cc
View File

@ -122,12 +122,14 @@ void writecb(struct ev_loop *loop, ev_io *w, int revents) {
rv = client->connect(); rv = client->connect();
if (rv != 0) { if (rv != 0) {
client->fail(); client->fail();
delete client;
return; return;
} }
return; return;
} }
if (rv != 0) { if (rv != 0) {
client->fail(); client->fail();
delete client;
} }
} }
} // namespace } // namespace
@ -138,6 +140,7 @@ void readcb(struct ev_loop *loop, ev_io *w, int revents) {
client->restart_timeout(); client->restart_timeout();
if (client->do_read() != 0) { if (client->do_read() != 0) {
client->fail(); client->fail();
delete client;
return; return;
} }
writecb(loop, &client->wev, revents); writecb(loop, &client->wev, revents);
@ -159,14 +162,17 @@ void rate_period_timeout_w_cb(struct ev_loop *loop, ev_timer *w, int revents) {
++req_todo; ++req_todo;
--worker->nreqs_rem; --worker->nreqs_rem;
} }
worker->clients.push_back( auto client =
make_unique<Client>(worker->next_client_id++, worker, req_todo)); make_unique<Client>(worker->next_client_id++, worker, req_todo);
auto &client = worker->clients.back();
++worker->nconns_made;
if (client->connect() != 0) { if (client->connect() != 0) {
std::cerr << "client could not connect to host" << std::endl; std::cerr << "client could not connect to host" << std::endl;
client->fail(); client->fail();
} else {
client.release();
} }
++worker->nconns_made;
} }
if (worker->nconns_made >= worker->nclients) { if (worker->nconns_made >= worker->nclients) {
ev_timer_stop(worker->loop, w); ev_timer_stop(worker->loop, w);
@ -1071,17 +1077,6 @@ Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
config->rate_period); config->rate_period);
timeout_watcher.data = this; timeout_watcher.data = this;
if (!config->is_rate_mode()) {
for (size_t i = 0; i < nclients; ++i) {
auto req_todo = nreqs_per_client;
if (nreqs_rem > 0) {
++req_todo;
--nreqs_rem;
}
clients.push_back(make_unique<Client>(next_client_id++, this, req_todo));
}
}
auto request_times_max_stats = std::min(req_todo, MAX_STATS); auto request_times_max_stats = std::min(req_todo, MAX_STATS);
request_times_sampling_step = request_times_sampling_step =
(req_todo + request_times_max_stats - 1) / request_times_max_stats; (req_todo + request_times_max_stats - 1) / request_times_max_stats;
@ -1089,19 +1084,23 @@ Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
Worker::~Worker() { Worker::~Worker() {
ev_timer_stop(loop, &timeout_watcher); ev_timer_stop(loop, &timeout_watcher);
// first clear clients so that io watchers are stopped before
// destructing ev_loop.
clients.clear();
ev_loop_destroy(loop); ev_loop_destroy(loop);
} }
void Worker::run() { void Worker::run() {
if (!config->is_rate_mode()) { if (!config->is_rate_mode()) {
for (auto &client : clients) { for (size_t i = 0; i < nclients; ++i) {
auto req_todo = nreqs_per_client;
if (nreqs_rem > 0) {
++req_todo;
--nreqs_rem;
}
auto client = make_unique<Client>(next_client_id++, this, req_todo);
if (client->connect() != 0) { if (client->connect() != 0) {
std::cerr << "client could not connect to host" << std::endl; std::cerr << "client could not connect to host" << std::endl;
client->fail(); client->fail();
} else {
client.release();
} }
} }
} else { } else {

1
src/h2load.h
View File

@ -209,7 +209,6 @@ enum ClientState { CLIENT_IDLE, CLIENT_CONNECTED };
struct Client; struct Client;
struct Worker { struct Worker {
std::vector<std::unique_ptr<Client>> clients;
Stats stats; Stats stats;
struct ev_loop *loop; struct ev_loop *loop;
SSL_CTX *ssl_ctx; SSL_CTX *ssl_ctx;