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

Don't count closed streams in nghttp2_session_want_{read,write}

This commit is contained in:
Tatsuhiro Tsujikawa 2014-05-23 22:23:38 +09:00
parent 78a55935ac
commit 9677788317
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nghttp2_session.c
View File

@ -5293,28 +5293,47 @@ int nghttp2_session_recv(nghttp2_session *session)
} }
} }
/*
* Returns the number of active streams, which includes streams in
* reserved state.
*/
static size_t session_get_num_active_streams(nghttp2_session *session)
{
return nghttp2_map_size(&session->streams) - session->num_closed_streams;
}
int nghttp2_session_want_read(nghttp2_session *session) int nghttp2_session_want_read(nghttp2_session *session)
{ {
size_t num_active_streams;
/* If these flags are set, we don't want to read. The application /* If these flags are set, we don't want to read. The application
should drop the connection. */ should drop the connection. */
if((session->goaway_flags & NGHTTP2_GOAWAY_FAIL_ON_SEND) && if((session->goaway_flags & NGHTTP2_GOAWAY_FAIL_ON_SEND) &&
(session->goaway_flags & NGHTTP2_GOAWAY_SEND)) { (session->goaway_flags & NGHTTP2_GOAWAY_SEND)) {
return 0; return 0;
} }
num_active_streams = session_get_num_active_streams(session);
/* Unless GOAWAY is sent or received, we always want to read /* Unless GOAWAY is sent or received, we always want to read
incoming frames. After GOAWAY is sent or received, we are only incoming frames. After GOAWAY is sent or received, we are only
interested in active streams. */ interested in active streams. */
return !session->goaway_flags || nghttp2_map_size(&session->streams) > 0; return !session->goaway_flags || num_active_streams > 0;
} }
int nghttp2_session_want_write(nghttp2_session *session) int nghttp2_session_want_write(nghttp2_session *session)
{ {
size_t num_active_streams;
/* If these flags are set, we don't want to write any data. The /* If these flags are set, we don't want to write any data. The
application should drop the connection. */ application should drop the connection. */
if((session->goaway_flags & NGHTTP2_GOAWAY_FAIL_ON_SEND) && if((session->goaway_flags & NGHTTP2_GOAWAY_FAIL_ON_SEND) &&
(session->goaway_flags & NGHTTP2_GOAWAY_SEND)) { (session->goaway_flags & NGHTTP2_GOAWAY_SEND)) {
return 0; return 0;
} }
num_active_streams = session_get_num_active_streams(session);
/* /*
* Unless GOAWAY is sent or received, we want to write frames if * Unless GOAWAY is sent or received, we want to write frames if
* there is pending ones. If pending frame is request/push response * there is pending ones. If pending frame is request/push response
@ -5325,7 +5344,7 @@ int nghttp2_session_want_write(nghttp2_session *session)
return (session->aob.item != NULL || !nghttp2_pq_empty(&session->ob_pq) || return (session->aob.item != NULL || !nghttp2_pq_empty(&session->ob_pq) ||
(!nghttp2_pq_empty(&session->ob_ss_pq) && (!nghttp2_pq_empty(&session->ob_ss_pq) &&
!session_is_outgoing_concurrent_streams_max(session))) && !session_is_outgoing_concurrent_streams_max(session))) &&
(!session->goaway_flags || nghttp2_map_size(&session->streams) > 0); (!session->goaway_flags || num_active_streams > 0);
} }
int nghttp2_session_add_ping(nghttp2_session *session, uint8_t flags, int nghttp2_session_add_ping(nghttp2_session *session, uint8_t flags,