From c23461a22a1ead0a34dc209c2918ec4ccaf61475 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 9 Feb 2022 14:24:55 -0500 Subject: [PATCH] Test honestly for . Commit 6a2a70a02 supposed that any platform having would also have . It turns out there are still a few people using platforms where that's not so, so we'd better make a separate configure probe for it. But since it took this long to notice, I'm content with the decision to not have a separate code path for epoll-only machines; we'll just fall back to using poll() for these stragglers. Per gripe from Gabriela Serventi. Back-patch to v14 where this code came in. Discussion: https://postgr.es/m/CAHOHWE-JjJDfcYuLAAEO7Jk07atFAU47z8TzHzg71gbC0aMy=g@mail.gmail.com --- configure | 2 +- configure.ac | 1 + src/backend/storage/ipc/latch.c | 9 ++++----- src/include/pg_config.h.in | 3 +++ src/tools/msvc/Solution.pm | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0353624a4e..dcf03ce6a4 100755 --- a/configure +++ b/configure @@ -13591,7 +13591,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h fi -for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/uio.h sys/un.h termios.h ucred.h wctype.h +for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/signalfd.h sys/sockio.h sys/tas.h sys/uio.h sys/un.h termios.h ucred.h wctype.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index 6a7bb848c4..4b9cf07ee7 100644 --- a/configure.ac +++ b/configure.ac @@ -1406,6 +1406,7 @@ AC_CHECK_HEADERS(m4_normalize([ sys/select.h sys/sem.h sys/shm.h + sys/signalfd.h sys/sockio.h sys/tas.h sys/uio.h diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c index 1d893cf863..6ff1ecbe09 100644 --- a/src/backend/storage/ipc/latch.c +++ b/src/backend/storage/ipc/latch.c @@ -43,6 +43,9 @@ #ifdef HAVE_SYS_EVENT_H #include #endif +#ifdef HAVE_SYS_SIGNALFD_H +#include +#endif #ifdef HAVE_POLL_H #include #endif @@ -69,7 +72,7 @@ #if defined(WAIT_USE_EPOLL) || defined(WAIT_USE_POLL) || \ defined(WAIT_USE_KQUEUE) || defined(WAIT_USE_WIN32) /* don't overwrite manual choice */ -#elif defined(HAVE_SYS_EPOLL_H) +#elif defined(HAVE_SYS_EPOLL_H) && defined(HAVE_SYS_SIGNALFD_H) #define WAIT_USE_EPOLL #elif defined(HAVE_KQUEUE) #define WAIT_USE_KQUEUE @@ -81,10 +84,6 @@ #error "no wait set implementation available" #endif -#ifdef WAIT_USE_EPOLL -#include -#endif - /* typedef in latch.h */ struct WaitEventSet { diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index d69d461ff2..6c7eea17d4 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -640,6 +640,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SHM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SIGNALFD_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKIO_H diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 138b630b99..c983f506f9 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -406,6 +406,7 @@ sub GenerateFiles HAVE_SYS_SELECT_H => undef, HAVE_SYS_SEM_H => undef, HAVE_SYS_SHM_H => undef, + HAVE_SYS_SIGNALFD_H => undef, HAVE_SYS_SOCKIO_H => undef, HAVE_SYS_STAT_H => 1, HAVE_SYS_TAS_H => undef,