Skip to content
Snippets Groups Projects
Commit eff4419b authored by Craig Tiller's avatar Craig Tiller
Browse files

Fixes

parent 061f7d9c
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,8 @@ void gpr_slice_buffer_swap(gpr_slice_buffer *a, gpr_slice_buffer *b); ...@@ -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 */ /* move all of the elements of src into dst */
void gpr_slice_buffer_move_into(gpr_slice_buffer *src, gpr_slice_buffer *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 */ /* 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 #ifdef __cplusplus
} }
......
...@@ -248,7 +248,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx, ...@@ -248,7 +248,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx,
size_t nfds) { size_t nfds) {
size_t i; size_t i;
pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr)); pollset_hdr *h = gpr_malloc(sizeof(pollset_hdr));
epoll_event ev; struct epoll_event ev;
int err; int err;
pollset->vtable = &multipoll_with_epoll_pollset; pollset->vtable = &multipoll_with_epoll_pollset;
...@@ -264,7 +264,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx, ...@@ -264,7 +264,7 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx,
ev.data.ptr = NULL; ev.data.ptr = NULL;
err = epoll_ctl(h->epoll_fd, EPOLL_CTL_ADD, GRPC_WAKEUP_FD_GET_READ_FD(&grpc_global_wakeup_fd), &ev); err = epoll_ctl(h->epoll_fd, EPOLL_CTL_ADD, GRPC_WAKEUP_FD_GET_READ_FD(&grpc_global_wakeup_fd), &ev);
if (err < 0) { 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)); strerror(errno));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment