Fixing stuff

pull/2149/head
Craig Tiller 10 years ago
parent 9850510e52
commit cdf52bc172
  1. 4
      src/core/transport/chttp2/stream_lists.c
  2. 4
      src/core/transport/chttp2/writing.c
  3. 9
      src/core/transport/chttp2_transport.c

@ -158,8 +158,8 @@ void grpc_chttp2_list_add_writing_stream(
int grpc_chttp2_list_have_writing_streams( int grpc_chttp2_list_have_writing_streams(
grpc_chttp2_transport_writing *transport_writing) { grpc_chttp2_transport_writing *transport_writing) {
return stream_list_empty(TRANSPORT_FROM_WRITING(transport_writing), return !stream_list_empty(TRANSPORT_FROM_WRITING(transport_writing),
GRPC_CHTTP2_LIST_WRITING); GRPC_CHTTP2_LIST_WRITING);
} }
int grpc_chttp2_list_pop_writing_stream( int grpc_chttp2_list_pop_writing_stream(

@ -130,12 +130,14 @@ int grpc_chttp2_unlocking_check_writes(
transport_global->incoming_window += window_delta; transport_global->incoming_window += window_delta;
} }
return transport_writing->outbuf.length > 0 || return transport_writing->outbuf.count > 0 ||
grpc_chttp2_list_have_writing_streams(transport_writing); grpc_chttp2_list_have_writing_streams(transport_writing);
} }
void grpc_chttp2_perform_writes( void grpc_chttp2_perform_writes(
grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint) { grpc_chttp2_transport_writing *transport_writing, grpc_endpoint *endpoint) {
GPR_ASSERT(transport_writing->outbuf.count > 0 || grpc_chttp2_list_have_writing_streams(transport_writing));
finalize_outbuf(transport_writing); finalize_outbuf(transport_writing);
GPR_ASSERT(transport_writing->outbuf.count > 0); GPR_ASSERT(transport_writing->outbuf.count > 0);

@ -227,10 +227,11 @@ static void init_transport(grpc_chttp2_transport *t,
grpc_chttp2_stream_map_init(&t->new_stream_map, 8); grpc_chttp2_stream_map_init(&t->new_stream_map, 8);
/* copy in initial settings to all setting sets */ /* copy in initial settings to all setting sets */
for (i = 0; i < NUM_SETTING_SETS; i++) { for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) {
for (j = 0; j < GRPC_CHTTP2_NUM_SETTINGS; j++) { t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value;
t->global.settings[i][j] = for (j = 0; j < NUM_SETTING_SETS; j++) {
grpc_chttp2_settings_parameters[j].default_value; t->global.settings[j][i] =
grpc_chttp2_settings_parameters[i].default_value;
} }
} }
t->global.dirtied_local_settings = 1; t->global.dirtied_local_settings = 1;

Loading…
Cancel
Save