diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-06-19 13:08:00 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-06-19 13:08:00 -0700 |
| commit | f3fac562e8994631484f77ad8b0c6c17582699a8 (patch) | |
| tree | 8da525cb2cf5aac00711cb994a49ac0106940120 /src/core/iomgr/tcp_posix.c | |
| parent | dc65c14d3bc39979503bcbb0578a6baf47cf147f (diff) | |
| parent | 52c6142a30fc74d665bf6d7270c0d6835a9db38f (diff) | |
Merge pull request #1577 from ctiller/we-dont-need-no-backup
Remove backup poller from GRPC core
Diffstat (limited to 'src/core/iomgr/tcp_posix.c')
| -rw-r--r-- | src/core/iomgr/tcp_posix.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 2f19f9d442..9ad089af66 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -266,7 +266,7 @@ typedef struct { grpc_endpoint base; grpc_fd *em_fd; int fd; - int iov_size; /* Number of slices to allocate per read attempt */ + int iov_size; /* Number of slices to allocate per read attempt */ int finished_edge; size_t slice_size; gpr_refcount refcount; @@ -295,7 +295,7 @@ static void grpc_tcp_shutdown(grpc_endpoint *ep) { static void grpc_tcp_unref(grpc_tcp *tcp) { int refcount_zero = gpr_unref(&tcp->refcount); if (refcount_zero) { - grpc_fd_orphan(tcp->em_fd, NULL, NULL); + grpc_fd_orphan(tcp->em_fd, NULL, "tcp_unref_orphan"); gpr_free(tcp); } } @@ -412,8 +412,7 @@ static void grpc_tcp_continue_read(grpc_tcp *tcp) { ++tcp->iov_size; } GPR_ASSERT(slice_state_has_available(&read_state)); - slice_state_transfer_ownership(&read_state, &final_slices, - &final_nslices); + slice_state_transfer_ownership(&read_state, &final_slices, &final_nslices); call_read_cb(tcp, final_slices, final_nslices, GRPC_ENDPOINT_CB_OK); slice_state_destroy(&read_state); grpc_tcp_unref(tcp); |