From 1aaf9f013beef06680d8e6512eb6426ab70f6ba2 Mon Sep 17 00:00:00 2001 From: Dave Hart Date: Mon, 18 Jun 2012 10:31:38 -0400 Subject: [PATCH] Avoid giving a spurious warning when timerfd support is unavailable We forgot to do the obligatory "Check if there is no syscall there" dance when calling timerfd_create(). (Commit message by Nick) --- epoll.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epoll.c b/epoll.c index edd4e18b48..91f0544b99 100644 --- a/epoll.c +++ b/epoll.c @@ -190,7 +190,14 @@ epoll_init(struct event_base *base) epollop->timerfd = -1; } } else { - event_warn("timerfd_create"); + if (errno != EINVAL && errno != ENOSYS) { + /* These errors probably mean that we were + * compiled with timerfd/TFD_* support, but + * we're running on a kernel that lacks those. + */ + event_warn("timerfd_create"); + } + epollop->timerfd = -1; } } else { epollop->timerfd = -1;