diff options
author | 2017-04-21 08:02:44 -0700 | |
---|---|---|
committer | 2017-04-21 08:02:44 -0700 | |
commit | 24c7a18e948354ae2d4629d4fdfce97d7ef5cf6e (patch) | |
tree | aaf1b35082322569505599034bf3bc2d1e73f610 /src/core/ext | |
parent | 9847a834ba7b85de17529e4473ef7156ba384115 (diff) | |
parent | 77a4c52cbf3706191640e117b1f9bccddd64f1ac (diff) |
Merge github.com:grpc/grpc into framing_costs
Diffstat (limited to 'src/core/ext')
-rw-r--r-- | src/core/ext/filters/message_size/message_size_filter.c | 2 | ||||
-rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/ext/filters/message_size/message_size_filter.c b/src/core/ext/filters/message_size/message_size_filter.c index db0f011905..e3ffc41f90 100644 --- a/src/core/ext/filters/message_size/message_size_filter.c +++ b/src/core/ext/filters/message_size/message_size_filter.c @@ -130,6 +130,8 @@ static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, GRPC_ERROR_UNREF(new_error); } gpr_free(message_string); + } else { + GRPC_ERROR_REF(error); } // Invoke the next callback. grpc_closure_run(exec_ctx, calld->next_recv_message_ready, error); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index c08010e209..d6b79bd492 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -2603,6 +2603,7 @@ static bool incoming_byte_stream_next(grpc_exec_ctx *exec_ctx, (grpc_chttp2_incoming_byte_stream *)byte_stream; grpc_chttp2_stream *s = bs->stream; if (s->unprocessed_incoming_frames_buffer.length > 0) { + GPR_TIMER_END("incoming_byte_stream_next", 0); return true; } else { gpr_ref(&bs->refs); |