database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Test honestly for <sys/signalfd.h>.

Browse Source 
Commit 6a2a70a02 supposed that any platform having <sys/epoll.h>
would also have <sys/signalfd.h>.  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
This commit is contained in:
Tom Lane 2022-02-09 14:24:54 -05:00
parent f48385c132
commit c5f5b4dd4b
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -13596,7 +13596,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi 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/personality.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/personality.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 : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

1
configure.ac
View File

@ -1412,6 +1412,7 @@ AC_CHECK_HEADERS(m4_normalize([
sys/select.h sys/select.h
sys/sem.h sys/sem.h
sys/shm.h sys/shm.h
sys/signalfd.h
sys/sockio.h sys/sockio.h
sys/tas.h sys/tas.h
sys/uio.h sys/uio.h

9
src/backend/storage/ipc/latch.c
View File

@ -43,6 +43,9 @@
#ifdef HAVE_SYS_EVENT_H #ifdef HAVE_SYS_EVENT_H
#include <sys/event.h> #include <sys/event.h>
#endif #endif
#ifdef HAVE_SYS_SIGNALFD_H
#include <sys/signalfd.h>
#endif
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
#endif #endif
@ -69,7 +72,7 @@
#if defined(WAIT_USE_EPOLL) || defined(WAIT_USE_POLL) || \ #if defined(WAIT_USE_EPOLL) || defined(WAIT_USE_POLL) || \
defined(WAIT_USE_KQUEUE) || defined(WAIT_USE_WIN32) defined(WAIT_USE_KQUEUE) || defined(WAIT_USE_WIN32)
/* don't overwrite manual choice */ /* 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 #define WAIT_USE_EPOLL
#elif defined(HAVE_KQUEUE) #elif defined(HAVE_KQUEUE)
#define WAIT_USE_KQUEUE #define WAIT_USE_KQUEUE
@ -81,10 +84,6 @@
#error "no wait set implementation available" #error "no wait set implementation available"
#endif #endif
#ifdef WAIT_USE_EPOLL
#include <sys/signalfd.h>
#endif
/* typedef in latch.h */ /* typedef in latch.h */
struct WaitEventSet struct WaitEventSet
{ {

3
src/include/pg_config.h.in
View File

@ -634,6 +634,9 @@
/* Define to 1 if you have the <sys/shm.h> header file. */ /* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H #undef HAVE_SYS_SHM_H
/* Define to 1 if you have the <sys/signalfd.h> header file. */
#undef HAVE_SYS_SIGNALFD_H
/* Define to 1 if you have the <sys/sockio.h> header file. */ /* Define to 1 if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H #undef HAVE_SYS_SOCKIO_H

1
src/tools/msvc/Solution.pm
View File

@ -404,6 +404,7 @@ sub GenerateFiles
HAVE_SYS_SELECT_H => undef, HAVE_SYS_SELECT_H => undef,
HAVE_SYS_SEM_H => undef, HAVE_SYS_SEM_H => undef,
HAVE_SYS_SHM_H => undef, HAVE_SYS_SHM_H => undef,
HAVE_SYS_SIGNALFD_H => undef,
HAVE_SYS_SOCKIO_H => undef, HAVE_SYS_SOCKIO_H => undef,
HAVE_SYS_STAT_H => 1, HAVE_SYS_STAT_H => 1,
HAVE_SYS_TAS_H => undef, HAVE_SYS_TAS_H => undef,