From 73f7d5048c0e2ad4817ad208de02adee73938ed0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 31 May 2014 06:05:29 +0200 Subject: Unblock signals only during poll/epoll wait If signals are normally blocked, we can avoid a lot of EINTR handling. --- src/poll.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/poll.c') diff --git a/src/poll.c b/src/poll.c index a2d206b..f05a345 100644 --- a/src/poll.c +++ b/src/poll.c @@ -34,6 +34,10 @@ #include "async.h" #include "peer.h" +#include +#include + + #ifdef USE_EPOLL #include @@ -129,6 +133,10 @@ void fastd_poll_handle(void) { if (timeout < 0 || timeout > maintenance_timeout) timeout = maintenance_timeout; + sigset_t set, oldset; + sigemptyset(&set); + pthread_sigmask(SIG_SETMASK, &set, &oldset); + struct epoll_event events[16]; int ret = epoll_wait(ctx.epoll_fd, events, 16, timeout); if (ret < 0) { @@ -138,6 +146,8 @@ void fastd_poll_handle(void) { exit_errno("epoll_wait"); } + pthread_sigmask(SIG_SETMASK, &oldset, NULL); + fastd_update_time(); size_t i; @@ -243,6 +253,10 @@ void fastd_poll_handle(void) { if (VECTOR_LEN(ctx.pollfds) != 2 + ctx.n_socks + VECTOR_LEN(ctx.peers)) exit_bug("fd count mismatch"); + sigset_t set, oldset; + sigemptyset(&set); + pthread_sigmask(SIG_SETMASK, &set, &oldset); + int ret = poll(VECTOR_DATA(ctx.pollfds), VECTOR_LEN(ctx.pollfds), timeout); if (ret < 0) { if (errno == EINTR) @@ -251,6 +265,8 @@ void fastd_poll_handle(void) { exit_errno("poll"); } + pthread_sigmask(SIG_SETMASK, &oldset, NULL); + fastd_update_time(); if (VECTOR_INDEX(ctx.pollfds, 0).revents & POLLIN) -- cgit v1.2.3