From 5fa1c3fb6036b4220cb03941ebc17bae6da43cac Mon Sep 17 00:00:00 2001
From: David Klempner <klempner@google.com>
Date: Wed, 11 Feb 2015 17:06:43 -0800
Subject: [PATCH] Destroy the wakeup fd in the right function
---
src/core/iomgr/pollset_multipoller_with_epoll.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c
index a46dfe0520..9fb2819506 100644
--- a/src/core/iomgr/pollset_multipoller_with_epoll.c
+++ b/src/core/iomgr/pollset_multipoller_with_epoll.c
@@ -149,14 +149,13 @@ static int multipoll_with_epoll_pollset_maybe_work(
static void multipoll_with_epoll_pollset_destroy(grpc_pollset *pollset) {
pollset_hdr *h = pollset->data.ptr;
-
+ grpc_wakeup_fd_destroy(&h->wakeup_fd);
close(h->epoll_fd);
gpr_free(h);
}
static void epoll_kick(grpc_pollset *pollset) {
pollset_hdr *h = pollset->data.ptr;
- grpc_wakeup_fd_destroy(&h->wakeup_fd);
grpc_wakeup_fd_wakeup(&h->wakeup_fd);
}
--
GitLab