From: Daniel Kahn Gillmor Date: Tue, 1 Nov 2016 00:57:44 -0400 Subject: agent: Avoid scheduled checks on socket when inotify is working. * agent/gpg-agent.c (handle_connections): When inotify is working, we do not need to schedule a timer to evaluate whether we control our own socket or not. Signed-off-by: Daniel Kahn Gillmor --- agent/gpg-agent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 5bdbbbe..d68b5ad 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -3043,6 +3043,8 @@ handle_connections (gnupg_fd_t listen_fd, /* avoid a fine-grained timer if we don't need one: */ timertbl[0].interval.tv_sec = need_tick () ? TIMERTICK_INTERVAL : 0; + /* avoid waking up to check sockets if we can count on inotify */ + timertbl[1].interval.tv_sec = (sock_inotify_fd == -1) ? CHECK_OWN_SOCKET_INTERVAL : 0; /* loop through all timers, fire any registered functions, and plan next timer to trigger */