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

Assign default priority if dep_stream in PRIORITY does not exist

This commit is contained in:
Tatsuhiro Tsujikawa 2014-11-08 16:12:13 +09:00
parent 292c01fda2
commit c31be5af4d
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nghttp2_session.c
View File

@ -567,11 +567,13 @@ void nghttp2_session_del(nghttp2_session *session)
int nghttp2_session_reprioritize_stream int nghttp2_session_reprioritize_stream
(nghttp2_session *session, nghttp2_stream *stream, (nghttp2_session *session, nghttp2_stream *stream,
const nghttp2_priority_spec *pri_spec) const nghttp2_priority_spec *pri_spec_in)
{ {
int rv; int rv;
nghttp2_stream *dep_stream; nghttp2_stream *dep_stream;
nghttp2_stream *root_stream; nghttp2_stream *root_stream;
nghttp2_priority_spec pri_spec_default;
const nghttp2_priority_spec *pri_spec = pri_spec_in;
if(!nghttp2_stream_in_dep_tree(stream)) { if(!nghttp2_stream_in_dep_tree(stream)) {
return 0; return 0;
@ -582,6 +584,15 @@ int nghttp2_session_reprioritize_stream
(session, NGHTTP2_PROTOCOL_ERROR, "depend on itself"); (session, NGHTTP2_PROTOCOL_ERROR, "depend on itself");
} }
if(pri_spec->stream_id != 0) {
dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
if(!dep_stream || !nghttp2_stream_in_dep_tree(dep_stream)) {
nghttp2_priority_spec_default_init(&pri_spec_default);
pri_spec = &pri_spec_default;
}
}
if(pri_spec->stream_id == 0) { if(pri_spec->stream_id == 0) {
nghttp2_stream_dep_remove_subtree(stream); nghttp2_stream_dep_remove_subtree(stream);
@ -602,12 +613,6 @@ int nghttp2_session_reprioritize_stream
return rv; return rv;
} }
dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
if(!dep_stream || !nghttp2_stream_in_dep_tree(dep_stream)) {
return 0;
}
if(nghttp2_stream_dep_subtree_find(stream, dep_stream)) { if(nghttp2_stream_dep_subtree_find(stream, dep_stream)) {
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"stream: cycle detected, dep_stream(%p)=%d " "stream: cycle detected, dep_stream(%p)=%d "

4
tests/nghttp2_session_test.c
View File

@ -3074,13 +3074,13 @@ void test_nghttp2_session_reprioritize_stream(void)
CU_ASSERT(10 == stream->weight); CU_ASSERT(10 == stream->weight);
CU_ASSERT(NULL == stream->dep_prev); CU_ASSERT(NULL == stream->dep_prev);
/* dep_stream does not exist */ /* If dep_stream does not exist, default priority is assigned. */
nghttp2_priority_spec_init(&pri_spec, 3, 99, 0); nghttp2_priority_spec_init(&pri_spec, 3, 99, 0);
nghttp2_session_reprioritize_stream(session, stream, &pri_spec); nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
CU_ASSERT(10 == stream->weight); CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
CU_ASSERT(NULL == stream->dep_prev); CU_ASSERT(NULL == stream->dep_prev);
dep_stream = open_stream(session, 3); dep_stream = open_stream(session, 3);