pull/3555/head
Craig Tiller 10 years ago
parent 061f7d9c86
commit eff4419b2a
  1. 3
      include/grpc/support/slice_buffer.h
  2. 4
      src/core/iomgr/pollset_multipoller_with_epoll.c

@ -87,7 +87,8 @@ void gpr_slice_buffer_swap(gpr_slice_buffer *a, gpr_slice_buffer *b);
/* move all of the elements of src into dst */
void gpr_slice_buffer_move_into(gpr_slice_buffer *src, gpr_slice_buffer *dst);
/* remove n bytes from the end of a slice buffer */
void gpr_slice_buffer_trim_end(gpr_slice_buffer *src, size_t n, gpr_slice_buffer *garbage);
void gpr_slice_buffer_trim_end(gpr_slice_buffer *src, size_t n,
gpr_slice_buffer *garbage);
#ifdef __cplusplus
}

@ -248,7 +248,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx,
size_t nfds) {
size_t i;
pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr));
epoll_event ev;
struct epoll_event ev;
int err;
pollset->vtable = &multipoll_with_epoll_pollset;
@ -264,7 +264,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx,
ev.data.ptr = NULL;
err = epoll_ctl(h->epoll_fd, EPOLL_CTL_ADD, GRPC_WAKEUP_FD_GET_READ_FD(&grpc_global_wakeup_fd), &ev);
if (err < 0) {
gpr_log(GPR_ERROR, "epoll_ctl add for %d failed: %s", fd->fd,
gpr_log(GPR_ERROR, "epoll_ctl add for %d failed: %s", GRPC_WAKEUP_FD_GET_READ_FD(&grpc_global_wakeup_fd),
strerror(errno));
}

Loading…
Cancel
Save