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

nghttpx: Use ev_timer_start intead of ev_timer_again for settings_timer_ 

Since we only use it once, we don't have to use ev_timer_again, and
stop timer manually.
This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-21 13:48:13 +09:00
parent 0b9ee38db6
commit 9a3461e2b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_http2_session.cc
View File

@ -90,7 +90,6 @@ void connchk_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
namespace { namespace {
void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
auto http2session = static_cast<Http2Session *>(w->data); auto http2session = static_cast<Http2Session *>(w->data);
http2session->stop_settings_timer();
SSLOG(INFO, http2session) << "SETTINGS timeout"; SSLOG(INFO, http2session) << "SETTINGS timeout";
downstream_failure(http2session->get_addr()); downstream_failure(http2session->get_addr());
@ -203,7 +202,7 @@ Http2Session::Http2Session(struct ev_loop *loop, SSL_CTX *ssl_ctx,
// SETTINGS ACK timeout is 10 seconds for now. We will resuse this // SETTINGS ACK timeout is 10 seconds for now. We will resuse this
// many times, so use repeat timeout value. // many times, so use repeat timeout value.
ev_timer_init(&settings_timer_, settings_timeout_cb, 0., 10.); ev_timer_init(&settings_timer_, settings_timeout_cb, 0., 0.);
settings_timer_.data = this; settings_timer_.data = this;
@ -756,7 +755,8 @@ int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
} // namespace } // namespace
void Http2Session::start_settings_timer() { void Http2Session::start_settings_timer() {
ev_timer_again(conn_.loop, &settings_timer_); ev_timer_set(&settings_timer_, 10., 0.);
ev_timer_start(conn_.loop, &settings_timer_);
} }
void Http2Session::stop_settings_timer() { void Http2Session::stop_settings_timer() {