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

nghttpx: Don't call ev_TYPE_set macro while watcher is active

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-21 21:43:49 +09:00
parent c39f2b2c91
commit 53a41c953d
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx_client_handler.cc
View File

@ -583,14 +583,14 @@ struct ev_loop *ClientHandler::get_loop() const {
} }
void ClientHandler::reset_upstream_read_timeout(ev_tstamp t) { void ClientHandler::reset_upstream_read_timeout(ev_tstamp t) {
ev_timer_set(&rt_, 0., t); rt_.repeat = t;
if (ev_is_active(&rt_)) { if (ev_is_active(&rt_)) {
ev_timer_again(loop_, &rt_); ev_timer_again(loop_, &rt_);
} }
} }
void ClientHandler::reset_upstream_write_timeout(ev_tstamp t) { void ClientHandler::reset_upstream_write_timeout(ev_tstamp t) {
ev_timer_set(&wt_, 0., t); wt_.repeat = t;
if (ev_is_active(&wt_)) { if (ev_is_active(&wt_)) {
ev_timer_again(loop_, &wt_); ev_timer_again(loop_, &wt_);
} }

4
src/shrpx_connect_blocker.cc
View File

@ -50,6 +50,10 @@ bool ConnectBlocker::blocked() const { return ev_is_active(&timer_); }
void ConnectBlocker::on_success() { sleep_ = INITIAL_SLEEP; } void ConnectBlocker::on_success() { sleep_ = INITIAL_SLEEP; }
void ConnectBlocker::on_failure() { void ConnectBlocker::on_failure() {
if (ev_is_active(&timer_)) {
return;
}
sleep_ = std::min(128., sleep_ * 2); sleep_ = std::min(128., sleep_ * 2);
LOG(WARN) << "connect failure, start sleeping " << sleep_; LOG(WARN) << "connect failure, start sleeping " << sleep_;

6
src/shrpx_http2_session.cc
View File

@ -385,6 +385,12 @@ int Http2Session::initiate_connection() {
} }
} }
// rev_ and wev_ could possibly be active here. Since calling
// ev_io_set is not allowed while watcher is active, we have to
// stop them just in case.
ev_io_stop(loop_, &rev_);
ev_io_stop(loop_, &wev_);
ev_io_set(&rev_, fd_, EV_READ); ev_io_set(&rev_, fd_, EV_READ);
ev_io_set(&wev_, fd_, EV_WRITE); ev_io_set(&wev_, fd_, EV_WRITE);

9
src/shrpx_http_downstream_connection.cc
View File

@ -212,8 +212,8 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream) {
ev_set_cb(&rev_, readcb); ev_set_cb(&rev_, readcb);
ev_timer_set(&rt_, 0., get_config()->downstream_read_timeout); rt_.repeat = get_config()->downstream_read_timeout;
ev_timer_again(loop_, &rt_);
// TODO we should have timeout for connection establishment // TODO we should have timeout for connection establishment
ev_timer_again(loop_, &wt_); ev_timer_again(loop_, &wt_);
@ -424,10 +424,11 @@ void HttpDownstreamConnection::detach_downstream(Downstream *downstream) {
ev_io_start(loop_, &rev_); ev_io_start(loop_, &rev_);
ev_io_stop(loop_, &wev_); ev_io_stop(loop_, &wev_);
ev_set_cb(&rev_, idle_readcb);
ev_timer_stop(loop_, &wt_); ev_timer_stop(loop_, &wt_);
ev_set_cb(&rev_, idle_readcb); rt_.repeat = get_config()->downstream_idle_read_timeout;
ev_timer_set(&rt_, 0., get_config()->downstream_idle_read_timeout);
ev_set_cb(&rt_, idle_timeoutcb); ev_set_cb(&rt_, idle_timeoutcb);
ev_timer_again(loop_, &rt_); ev_timer_again(loop_, &rt_);
} }