From 589c940195f82738a95ff1f78a4f4d6a43566a41 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Tue, 14 Nov 2017 18:22:54 -0800 Subject: add test --- src/core/lib/iomgr/tcp_posix.cc | 4 ++-- src/core/lib/slice/slice_buffer.cc | 9 +++++---- src/core/lib/slice/slice_internal.h | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/core/lib') diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 016ca87219..0864cd594d 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -576,8 +576,8 @@ static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, if (errno == EAGAIN) { tcp->outgoing_slice_idx = unwind_slice_idx; tcp->outgoing_byte_idx = unwind_byte_idx; - grpc_slice_buffer_partial_reset_and_unref_internal( - exec_ctx, tcp->outgoing_buffer, unwind_slice_idx); + grpc_slice_buffer_partial_unref_internal(exec_ctx, tcp->outgoing_buffer, + unwind_slice_idx); return false; } else if (errno == EPIPE) { *error = grpc_error_set_int(GRPC_OS_ERROR(errno, "sendmsg"), diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index cd5040fbcb..8fdd8cf225 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -176,10 +176,11 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, sb->idx_of_first_valid_slice = 0; } -void grpc_slice_buffer_partial_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb, - size_t idx) { - GPR_ASSERT(idx <= sb->count); +void grpc_slice_buffer_partial_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb, + size_t idx) { + GPR_ASSERT(idx < sb->count); // if idx == count, then partial is not needed + GPR_ASSERT(sb->idx_of_first_valid_slice <= idx); size_t i; for (i = sb->idx_of_first_valid_slice; i < idx; i++) { diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 2c616950d7..10527dcdeb 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -32,9 +32,9 @@ grpc_slice grpc_slice_ref_internal(grpc_slice slice); void grpc_slice_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice slice); void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* sb); -void grpc_slice_buffer_partial_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb, - size_t idx); +void grpc_slice_buffer_partial_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb, + size_t idx); void grpc_slice_buffer_destroy_internal(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* sb); -- cgit v1.2.3