Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
6fec5320
Commit
6fec5320
authored
Aug 24, 2017
by
Tatsuhiro Tsujikawa
Committed by
GitHub
Aug 24, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #998 from nghttp2/h2load-fix-timing-script-stall
Fix bug that timing script stalls with -m1
parents
15713e0b
a6a561af
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
src/h2load.cc
src/h2load.cc
+14
-6
No files found.
src/h2load.cc
View file @
6fec5320
...
...
@@ -309,8 +309,7 @@ void conn_timeout_cb(EV_P_ ev_timer *w, int revents) {
namespace
{
bool
check_stop_client_request_timeout
(
Client
*
client
,
ev_timer
*
w
)
{
if
(
client
->
req_left
==
0
||
client
->
streams
.
size
()
>=
client
->
session
->
max_concurrent_streams
())
{
if
(
client
->
req_left
==
0
)
{
// no more requests to make, stop timer
ev_timer_stop
(
client
->
worker
->
loop
,
w
);
return
true
;
...
...
@@ -324,6 +323,11 @@ namespace {
void
client_request_timeout_cb
(
struct
ev_loop
*
loop
,
ev_timer
*
w
,
int
revents
)
{
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
)
{
ev_timer_stop
(
client
->
worker
->
loop
,
w
);
client
->
process_request_failure
();
...
...
@@ -833,10 +837,14 @@ void Client::on_stream_close(int32_t stream_id, bool success, bool final) {
return
;
}
if
(
!
config
.
timing_script
&&
!
final
&&
req_left
>
0
&&
submit_request
()
!=
0
)
{
if
(
!
final
&&
req_left
>
0
)
{
if
(
config
.
timing_script
)
{
if
(
!
ev_is_active
(
&
request_timeout_watcher
))
{
ev_feed_event
(
worker
->
loop
,
&
request_timeout_watcher
,
EV_TIMER
);
}
}
else
if
(
submit_request
()
!=
0
)
{
process_request_failure
();
return
;
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment