Save a syscall per connection

2 files changed, 9 insertions, 5 deletions

diff --git a/ponymap.c b/ponymap.c
index c1a19a3..d0b71ee 100644
--- a/ponymap.c
+++ b/ponymap.c
@@ -512,13 +512,16 @@ unit_abort (struct unit *u)
 	if (u->service->on_aborted)
 		u->service->on_aborted (u->service_data, u);
 
-	poller_timer_reset (&u->timeout_event);
-	poller_fd_reset (&u->fd_event);
-
 	u->transport->cleanup (u);
 	u->service->scan_free (u->service_data);
 	xclose (u->socket_fd);
 
+	poller_timer_reset (&u->timeout_event);
+
+	// This way we avoid a syscall with epoll
+	u->fd_event.fd = -1;
+	poller_fd_reset (&u->fd_event);
+
 	u->transport_data = NULL;
 	u->service_data = NULL;
 	u->socket_fd = -1;
diff --git a/utils.c b/utils.c
index 209af08..a36533a 100644
--- a/utils.c
+++ b/utils.c
@@ -1161,8 +1161,9 @@ poller_remove_at_index (struct poller *self, size_t index)
 	fd->index = -1;
 
 	poller_remove_from_dispatch (self, fd);
-	hard_assert (epoll_ctl (self->epoll_fd,
-		EPOLL_CTL_DEL, fd->fd, (void *) "") != -1);
+	if (fd->fd != -1)
+		hard_assert (epoll_ctl (self->epoll_fd,
+			EPOLL_CTL_DEL, fd->fd, (void *) "") != -1);
 
 	if (index != --self->len)
 	{