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

h2load: Fix memory leak detected by LeakSanitizer

This commit is contained in:
Tatsuhiro Tsujikawa 2014-06-20 00:00:06 +09:00
parent 0cd26d6f3b
commit 1caec7cb16
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/h2load.cc
View File

@ -315,7 +315,7 @@ int Client::on_write()
Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients, Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
Config *config) Config *config)
: stats{0}, evbase(event_base_new()), ssl_ctx(ssl_ctx), config(config), : stats{0}, evbase(event_base_new()), ssl_ctx(ssl_ctx), config(config),
id(id), term_timer_started(false) term_timer(nullptr), id(id)
{ {
stats.req_todo = req_todo; stats.req_todo = req_todo;
progress_interval = std::max((size_t)1, req_todo / 10); progress_interval = std::max((size_t)1, req_todo / 10);
@ -326,6 +326,9 @@ Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
Worker::~Worker() Worker::~Worker()
{ {
if(term_timer) {
event_free(term_timer);
}
event_base_free(evbase); event_base_free(evbase);
} }
@ -350,11 +353,11 @@ void term_timeout_cb(evutil_socket_t fd, short what, void *arg)
void Worker::schedule_terminate() void Worker::schedule_terminate()
{ {
if(term_timer_started) { if(term_timer) {
return; return;
} }
term_timer_started = true;
auto term_timer = evtimer_new(evbase, term_timeout_cb, this); term_timer = evtimer_new(evbase, term_timeout_cb, this);
timeval timeout = { 0, 0 }; timeval timeout = { 0, 0 };
evtimer_add(term_timer, &timeout); evtimer_add(term_timer, &timeout);
} }
@ -998,6 +1001,9 @@ int main(int argc, char **argv)
<< worker.stats.bytes_head << " bytes headers, " << worker.stats.bytes_head << " bytes headers, "
<< worker.stats.bytes_body << " bytes data" << worker.stats.bytes_body << " bytes data"
<< std::endl; << std::endl;
SSL_CTX_free(ssl_ctx);
return 0; return 0;
} }

2
src/h2load.h
View File

@ -113,9 +113,9 @@ struct Worker {
event_base *evbase; event_base *evbase;
SSL_CTX *ssl_ctx; SSL_CTX *ssl_ctx;
Config *config; Config *config;
event *term_timer;
size_t progress_interval; size_t progress_interval;
uint32_t id; uint32_t id;
bool term_timer_started;
Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t nreq_todo, size_t nclients, Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t nreq_todo, size_t nclients,
Config *config); Config *config);