Skip to content
Snippets Groups Projects
Commit cdf52bc1 authored by Craig Tiller's avatar Craig Tiller
Browse files

Fixing stuff

parent 9850510e
No related branches found
No related tags found
No related merge requests found
......@@ -158,7 +158,7 @@ void grpc_chttp2_list_add_writing_stream(
int grpc_chttp2_list_have_writing_streams(
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);
}
......
......@@ -130,12 +130,14 @@ int grpc_chttp2_unlocking_check_writes(
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);
}
void grpc_chttp2_perform_writes(
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);
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);
/* copy in initial settings to all setting sets */
for (i = 0; i < NUM_SETTING_SETS; i++) {
for (j = 0; j < GRPC_CHTTP2_NUM_SETTINGS; j++) {
t->global.settings[i][j] =
grpc_chttp2_settings_parameters[j].default_value;
for (i = 0; i < GRPC_CHTTP2_NUM_SETTINGS; i++) {
t->parsing.settings[i] = grpc_chttp2_settings_parameters[i].default_value;
for (j = 0; j < NUM_SETTING_SETS; j++) {
t->global.settings[j][i] =
grpc_chttp2_settings_parameters[i].default_value;
}
}
t->global.dirtied_local_settings = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment