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

Assign default priority if dependency parent stream does not exist

This commit is contained in:
Tatsuhiro Tsujikawa 2014-11-08 11:23:18 +09:00
parent ce71e65aee
commit 91f7d43e84
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/nghttp2_session.c
View File

@ -785,7 +785,7 @@ int nghttp2_session_add_rst_stream(nghttp2_session *session,
nghttp2_stream* nghttp2_session_open_stream(nghttp2_session *session, nghttp2_stream* nghttp2_session_open_stream(nghttp2_session *session,
int32_t stream_id, int32_t stream_id,
uint8_t flags, uint8_t flags,
nghttp2_priority_spec *pri_spec, nghttp2_priority_spec *pri_spec_in,
nghttp2_stream_state initial_state, nghttp2_stream_state initial_state,
void *stream_user_data) void *stream_user_data)
{ {
@ -793,7 +793,8 @@ nghttp2_stream* nghttp2_session_open_stream(nghttp2_session *session,
nghttp2_stream *stream; nghttp2_stream *stream;
nghttp2_stream *dep_stream = NULL; nghttp2_stream *dep_stream = NULL;
nghttp2_stream *root_stream; nghttp2_stream *root_stream;
int32_t dep_stream_id = 0; nghttp2_priority_spec pri_spec_default;
nghttp2_priority_spec *pri_spec = pri_spec_in;
if(session->server && !nghttp2_session_is_my_stream_id(session, stream_id)) { if(session->server && !nghttp2_session_is_my_stream_id(session, stream_id)) {
nghttp2_session_adjust_closed_stream(session, 1); nghttp2_session_adjust_closed_stream(session, 1);
@ -804,6 +805,17 @@ nghttp2_stream* nghttp2_session_open_stream(nghttp2_session *session,
return NULL; return NULL;
} }
if(pri_spec->stream_id != 0) {
dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
/* If dep_stream is not part of dependency tree, stream will get
default priority. */
if(!dep_stream || !nghttp2_stream_in_dep_tree(dep_stream)) {
nghttp2_priority_spec_default_init(&pri_spec_default);
pri_spec = &pri_spec_default;
}
}
nghttp2_stream_init(stream, stream_id, flags, initial_state, nghttp2_stream_init(stream, stream_id, flags, initial_state,
pri_spec->weight, &session->roots, pri_spec->weight, &session->roots,
session->remote_settings.initial_window_size, session->remote_settings.initial_window_size,
@ -839,21 +851,11 @@ nghttp2_stream* nghttp2_session_open_stream(nghttp2_session *session,
return stream; return stream;
} }
if(pri_spec->stream_id != 0) { if(pri_spec->stream_id == 0) {
dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
/* If dep_stream is not part of dependency tree, stream becomes
root. */
if(dep_stream && nghttp2_stream_in_dep_tree(dep_stream)) {
dep_stream_id = pri_spec->stream_id;
}
}
if(dep_stream_id == 0) {
++session->roots.num_streams; ++session->roots.num_streams;
if(pri_spec->stream_id == 0 && pri_spec->exclusive && if(pri_spec->exclusive &&
session->roots.num_streams <= NGHTTP2_MAX_DEP_TREE_LENGTH) { session->roots.num_streams <= NGHTTP2_MAX_DEP_TREE_LENGTH) {
rv = nghttp2_stream_dep_all_your_stream_are_belong_to_us rv = nghttp2_stream_dep_all_your_stream_are_belong_to_us
(stream, &session->ob_da_pq, session->last_cycle, session->aob.item); (stream, &session->ob_da_pq, session->last_cycle, session->aob.item);