diff options
author | Muxi Yan <muxi@users.noreply.github.com> | 2017-04-03 09:51:02 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-03 09:51:02 -0700 |
commit | 891b5922edb22f5b388dc540ba83e1486a359123 (patch) | |
tree | b0800e520c51aadeed5e0da8a9574ade89523827 /src/core/ext/transport/chttp2 | |
parent | b6afbf34b95a128ebd2381795eba9b411b3b9d0d (diff) | |
parent | 6ff5617dc5a536517d4c393202dea84933267a44 (diff) |
Merge pull request #9853 from muxi/fix-complete-fetch
Remove complete_fetch and use complete_fetch_locked
Diffstat (limited to 'src/core/ext/transport/chttp2')
-rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 2 | ||||
-rw-r--r-- | src/core/ext/transport/chttp2/transport/internal.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index 73f9454f7a..26f9449f4b 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1102,7 +1102,7 @@ static void continue_fetching_send_locked(grpc_exec_ctx *exec_ctx, return; /* early out */ } else if (grpc_byte_stream_next(exec_ctx, s->fetching_send_message, &s->fetching_slice, UINT32_MAX, - &s->complete_fetch)) { + &s->complete_fetch_locked)) { add_fetched_slice_locked(exec_ctx, t, s); } } diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 8b718e963c..50993e4ecd 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -452,7 +452,6 @@ struct grpc_chttp2_stream { int64_t next_message_end_offset; int64_t flow_controlled_bytes_written; bool complete_fetch_covered_by_poller; - grpc_closure complete_fetch; grpc_closure complete_fetch_locked; grpc_closure *fetching_send_message_finished; |