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

Merge pull request #998 from nghttp2/h2load-fix-timing-script-stall 

Fix bug that timing script stalls with -m1
This commit is contained in:
Tatsuhiro Tsujikawa 2017-08-24 21:17:43 +09:00 committed by GitHub
parent 15713e0b7c a6a561af47
commit 6fec532012
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/h2load.cc
View File

@ -309,8 +309,7 @@ void conn_timeout_cb(EV_P_ ev_timer *w, int revents) {
namespace { namespace {
bool check_stop_client_request_timeout(Client *client, ev_timer *w) { bool check_stop_client_request_timeout(Client *client, ev_timer *w) {
if (client->req_left == 0 || if (client->req_left == 0) {
client->streams.size() >= client->session->max_concurrent_streams()) {
// no more requests to make, stop timer // no more requests to make, stop timer
ev_timer_stop(client->worker->loop, w); ev_timer_stop(client->worker->loop, w);
return true; return true;
@ -324,6 +323,11 @@ namespace {
void client_request_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { void client_request_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
auto client = static_cast<Client *>(w->data); auto client = static_cast<Client *>(w->data);
if (client->streams.size() >= (size_t)config.max_concurrent_streams) {
ev_timer_stop(client->worker->loop, w);
return;
}
if (client->submit_request() != 0) { if (client->submit_request() != 0) {
ev_timer_stop(client->worker->loop, w); ev_timer_stop(client->worker->loop, w);
client->process_request_failure(); client->process_request_failure();
@ -833,10 +837,14 @@ void Client::on_stream_close(int32_t stream_id, bool success, bool final) {
return; return;
} }
if (!config.timing_script && !final && req_left > 0 && if (!final && req_left > 0) {
submit_request() != 0) { if (config.timing_script) {
process_request_failure(); if (!ev_is_active(&request_timeout_watcher)) {
return; ev_feed_event(worker->loop, &request_timeout_watcher, EV_TIMER);
}
} else if (submit_request() != 0) {
process_request_failure();
}
} }
} }