From f57341a5ce5a2a53e6c78e0df423d943f00d7561 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Sat, 9 Jul 2022 23:26:45 +1200 Subject: [PATCH 4/6] Remove dead handling for pre-POSIX sigwait(). sigwait is in POSIX-1:1996. It's now safe to assume that every supported system has a conforming sigwait(). (sigwaitinfo() is another story...). --- configure | 64 ++------------------------------------ configure.ac | 27 ---------------- src/bin/psql/command.c | 10 +++--- src/bin/psql/startup.c | 4 +-- src/include/pg_config.h.in | 7 ----- src/tools/msvc/Solution.pm | 2 -- 6 files changed, 10 insertions(+), 104 deletions(-) diff --git a/configure b/configure index e4cbd562ce..79d644d751 100755 --- a/configure +++ b/configure @@ -16242,11 +16242,9 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi -# Make sure there's a declaration for sigwait(), then make sure -# that it conforms to the POSIX standard (there seem to still be -# some platforms out there with pre-POSIX sigwait()). On Solaris, -# _POSIX_PTHREAD_SEMANTICS affects the result, but we already -# added that to CPPFLAGS. +# posix_fadvise() is a no-op on Solaris, so don't incur function overhead +# by calling it, 2009-04-02 +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c # The Clang compiler raises a warning for an undeclared identifier that matches # a compiler builtin function. All extant Clang versions are affected, as of # Clang 3.6.0. Test a builtin known to every version. This problem affects the @@ -16335,62 +16333,6 @@ case $ac_cv_c_decl_report in *) ac_c_decl_warn_flag= ;; esac -ac_fn_c_check_decl "$LINENO" "sigwait" "ac_cv_have_decl_sigwait" "#include -" -if test "x$ac_cv_have_decl_sigwait" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SIGWAIT $ac_have_decl -_ACEOF - -if test "x$ac_cv_have_decl_sigwait" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX-conforming sigwait declaration" >&5 -$as_echo_n "checking for POSIX-conforming sigwait declaration... " >&6; } -if ${pgac_cv_have_posix_decl_sigwait+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - int sigwait(const sigset_t *set, int *sig); - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - pgac_cv_have_posix_decl_sigwait=yes -else - pgac_cv_have_posix_decl_sigwait=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_have_posix_decl_sigwait" >&5 -$as_echo "$pgac_cv_have_posix_decl_sigwait" >&6; } -fi -if test "x$pgac_cv_have_posix_decl_sigwait" = xyes; then - -$as_echo "#define HAVE_POSIX_DECL_SIGWAIT 1" >>confdefs.h - -else - # On non-Windows, libpq requires POSIX sigwait() for thread safety. - if test "$enable_thread_safety" = yes -a "$PORTNAME" != "win32"; then - as_fn_error $? "POSIX-conforming sigwait is required to enable thread safety." "$LINENO" 5 - fi -fi - -# posix_fadvise() is a no-op on Solaris, so don't incur function overhead -# by calling it, 2009-04-02 -# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c if test "$PORTNAME" != "solaris"; then : for ac_func in posix_fadvise diff --git a/configure.ac b/configure.ac index 1cb5994822..59d108121d 100644 --- a/configure.ac +++ b/configure.ac @@ -1827,33 +1827,6 @@ PGAC_CHECK_BUILTIN_FUNC_PTR([__builtin_frame_address], [0]) # in case it finds that _LARGEFILE_SOURCE has to be #define'd for that. AC_FUNC_FSEEKO -# Make sure there's a declaration for sigwait(), then make sure -# that it conforms to the POSIX standard (there seem to still be -# some platforms out there with pre-POSIX sigwait()). On Solaris, -# _POSIX_PTHREAD_SEMANTICS affects the result, but we already -# added that to CPPFLAGS. -AC_CHECK_DECLS(sigwait, [], [], [#include ]) -if test "x$ac_cv_have_decl_sigwait" = xyes; then - AC_CACHE_CHECK([for POSIX-conforming sigwait declaration], - [pgac_cv_have_posix_decl_sigwait], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include - int sigwait(const sigset_t *set, int *sig); - ], - [])], - [pgac_cv_have_posix_decl_sigwait=yes], - [pgac_cv_have_posix_decl_sigwait=no])]) -fi -if test "x$pgac_cv_have_posix_decl_sigwait" = xyes; then - AC_DEFINE(HAVE_POSIX_DECL_SIGWAIT, 1, - [Define to 1 if you have a POSIX-conforming sigwait declaration.]) -else - # On non-Windows, libpq requires POSIX sigwait() for thread safety. - if test "$enable_thread_safety" = yes -a "$PORTNAME" != "win32"; then - AC_MSG_ERROR([POSIX-conforming sigwait is required to enable thread safety.]) - fi -fi - # posix_fadvise() is a no-op on Solaris, so don't incur function overhead # by calling it, 2009-04-02 # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index c562c04afe..e38f165e4b 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -4953,7 +4953,7 @@ do_watch(PQExpBuffer query_buf, double sleep) FILE *pagerpipe = NULL; int title_len; int res = 0; -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 sigset_t sigalrm_sigchld_sigint; sigset_t sigalrm_sigchld; sigset_t sigint; @@ -4967,7 +4967,7 @@ do_watch(PQExpBuffer query_buf, double sleep) return false; } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 sigemptyset(&sigalrm_sigchld_sigint); sigaddset(&sigalrm_sigchld_sigint, SIGCHLD); sigaddset(&sigalrm_sigchld_sigint, SIGALRM); @@ -5006,7 +5006,7 @@ do_watch(PQExpBuffer query_buf, double sleep) * PAGER environment variables, because traditional pagers probably won't * be very useful for showing a stream of results. */ -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 pagerprog = getenv("PSQL_WATCH_PAGER"); #endif if (pagerprog && myopt.topt.pager) @@ -5077,7 +5077,7 @@ do_watch(PQExpBuffer query_buf, double sleep) if (pagerpipe && ferror(pagerpipe)) break; -#ifndef HAVE_POSIX_DECL_SIGWAIT +#ifdef WIN32 /* * Set up cancellation of 'watch' via SIGINT. We redo this each time @@ -5146,7 +5146,7 @@ do_watch(PQExpBuffer query_buf, double sleep) restore_sigpipe_trap(); } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 /* Disable the interval timer. */ memset(&interval, 0, sizeof(interval)); setitimer(ITIMER_REAL, &interval, NULL); diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 7c2f555f15..e2e5678e2d 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -110,7 +110,7 @@ log_locus_callback(const char **filename, uint64 *lineno) } } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 static void empty_signal_handler(SIGNAL_ARGS) { @@ -308,7 +308,7 @@ main(int argc, char *argv[]) psql_setup_cancel_handler(); -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 /* * do_watch() needs signal handlers installed (otherwise sigwait() will diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 6268da407a..5b2a9db56d 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -149,10 +149,6 @@ don't. */ #undef HAVE_DECL_RTLD_NOW -/* Define to 1 if you have the declaration of `sigwait', and to 0 if you - don't. */ -#undef HAVE_DECL_SIGWAIT - /* Define to 1 if you have the declaration of `strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT @@ -412,9 +408,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_POLL_H -/* Define to 1 if you have a POSIX-conforming sigwait declaration. */ -#undef HAVE_POSIX_DECL_SIGWAIT - /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 17fe0d95ea..9ad22333ee 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -246,7 +246,6 @@ sub GenerateFiles HAVE_DECL_PWRITEV => 0, HAVE_DECL_RTLD_GLOBAL => 0, HAVE_DECL_RTLD_NOW => 0, - HAVE_DECL_SIGWAIT => 0, HAVE_DECL_STRLCAT => 0, HAVE_DECL_STRLCPY => 0, HAVE_DECL_STRNLEN => 1, @@ -331,7 +330,6 @@ sub GenerateFiles HAVE_PAM_PAM_APPL_H => undef, HAVE_POLL => undef, HAVE_POLL_H => undef, - HAVE_POSIX_DECL_SIGWAIT => undef, HAVE_POSIX_FADVISE => undef, HAVE_POSIX_FALLOCATE => undef, HAVE_PPC_LWARX_MUTEX_HINT => undef, -- 2.36.1