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

Rename window_size member of nghttp2_session as remote_window_size

This commit is contained in:
Tatsuhiro Tsujikawa 2013-08-09 01:31:15 +09:00
parent 19377fb3cd
commit a3ff4cb50b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nghttp2_session.c
View File

@ -144,7 +144,7 @@ static int nghttp2_session_new(nghttp2_session **session_ptr,
(*session_ptr)->remote_flow_control = 1; (*session_ptr)->remote_flow_control = 1;
(*session_ptr)->local_flow_control = 1; (*session_ptr)->local_flow_control = 1;
(*session_ptr)->window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE; (*session_ptr)->remote_window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE;
(*session_ptr)->recv_window_size = 0; (*session_ptr)->recv_window_size = 0;
(*session_ptr)->local_window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE; (*session_ptr)->local_window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE;
@ -819,7 +819,7 @@ static size_t nghttp2_session_next_data_read(nghttp2_session *session,
return NGHTTP2_DATA_PAYLOAD_LENGTH; return NGHTTP2_DATA_PAYLOAD_LENGTH;
} else { } else {
int32_t session_window_size = int32_t session_window_size =
session->remote_flow_control ? session->window_size : INT32_MAX; session->remote_flow_control ? session->remote_window_size : INT32_MAX;
int32_t stream_window_size = int32_t stream_window_size =
stream->remote_flow_control ? stream->remote_window_size : INT32_MAX; stream->remote_flow_control ? stream->remote_window_size : INT32_MAX;
int32_t window_size = nghttp2_min(session_window_size, int32_t window_size = nghttp2_min(session_window_size,
@ -1515,7 +1515,7 @@ int nghttp2_session_send(nghttp2_session *session)
stream->remote_window_size -= len; stream->remote_window_size -= len;
} }
if(session->remote_flow_control) { if(session->remote_flow_control) {
session->window_size -= len; session->remote_window_size -= len;
} }
} }
if(session->aob.framebufoff == session->aob.framebuflen) { if(session->aob.framebufoff == session->aob.framebuflen) {
@ -1879,7 +1879,7 @@ static int nghttp2_update_remote_initial_window_size_func
(stream->deferred_flags & NGHTTP2_DEFERRED_FLOW_CONTROL) && (stream->deferred_flags & NGHTTP2_DEFERRED_FLOW_CONTROL) &&
stream->remote_window_size > 0 && stream->remote_window_size > 0 &&
(arg->session->remote_flow_control == 0 || (arg->session->remote_flow_control == 0 ||
arg->session->window_size > 0)) { arg->session->remote_window_size > 0)) {
rv = nghttp2_pq_push(&arg->session->ob_pq, stream->deferred_data); rv = nghttp2_pq_push(&arg->session->ob_pq, stream->deferred_data);
if(rv == 0) { if(rv == 0) {
nghttp2_stream_detach_deferred_data(stream); nghttp2_stream_detach_deferred_data(stream);
@ -2285,15 +2285,15 @@ int nghttp2_session_on_window_update_received(nghttp2_session *session,
return 0; return 0;
} }
if(NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment < if(NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment <
session->window_size) { session->remote_window_size) {
return nghttp2_session_handle_invalid_connection return nghttp2_session_handle_invalid_connection
(session, frame, NGHTTP2_FLOW_CONTROL_ERROR); (session, frame, NGHTTP2_FLOW_CONTROL_ERROR);
} }
session->window_size += frame->window_update.window_size_increment; session->remote_window_size += frame->window_update.window_size_increment;
nghttp2_session_call_on_frame_received(session, frame); nghttp2_session_call_on_frame_received(session, frame);
/* To queue the DATA deferred by connection-level flow-control, we /* To queue the DATA deferred by connection-level flow-control, we
have to check all streams. Bad. */ have to check all streams. Bad. */
if(session->window_size > 0) { if(session->remote_window_size > 0) {
return nghttp2_session_push_back_deferred_data(session); return nghttp2_session_push_back_deferred_data(session);
} else { } else {
return 0; return 0;
@ -2336,7 +2336,7 @@ int nghttp2_session_on_window_update_received(nghttp2_session *session,
frame->window_update.window_size_increment; frame->window_update.window_size_increment;
if(stream->remote_window_size > 0 && if(stream->remote_window_size > 0 &&
(session->remote_flow_control == 0 || (session->remote_flow_control == 0 ||
session->window_size > 0) && session->remote_window_size > 0) &&
stream->deferred_data != NULL && stream->deferred_data != NULL &&
(stream->deferred_flags & NGHTTP2_DEFERRED_FLOW_CONTROL)) { (stream->deferred_flags & NGHTTP2_DEFERRED_FLOW_CONTROL)) {
int r; int r;

2
lib/nghttp2_session.h
View File

@ -171,7 +171,7 @@ struct nghttp2_session {
uint8_t local_flow_control; uint8_t local_flow_control;
/* Current sender window size. This value is computed against the /* Current sender window size. This value is computed against the
current initial window size of remote endpoint. */ current initial window size of remote endpoint. */
int32_t window_size; int32_t remote_window_size;
/* Keep track of the number of bytes received without /* Keep track of the number of bytes received without
WINDOW_UPDATE. */ WINDOW_UPDATE. */
int32_t recv_window_size; int32_t recv_window_size;

2
tests/nghttp2_session_test.c
View File

@ -2597,7 +2597,7 @@ void test_nghttp2_session_flow_control(void)
/* Initial window size to 64KiB - 1*/ /* Initial window size to 64KiB - 1*/
nghttp2_session_client_new(&session, &callbacks, &ud); nghttp2_session_client_new(&session, &callbacks, &ud);
/* Change it to 64KiB for easy calculation */ /* Change it to 64KiB for easy calculation */
session->window_size = 64*1024; session->remote_window_size = 64*1024;
session->remote_settings[NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE] = 64*1024; session->remote_settings[NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE] = 64*1024;
nghttp2_submit_request(session, NGHTTP2_PRI_DEFAULT, nv, &data_prd, NULL); nghttp2_submit_request(session, NGHTTP2_PRI_DEFAULT, nv, &data_prd, NULL);