[master] 464309df7 Everybody have sigaltstack(2)
Poul-Henning Kamp
phk at FreeBSD.org
Fri May 3 07:26:06 UTC 2024
commit 464309df79c3c12a1db0389b2203da7677f3e0b2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri May 3 06:37:17 2024 +0000
Everybody have sigaltstack(2)
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 7b433c596..13d209895 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -37,9 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_SIGALTSTACK
-# include <sys/mman.h>
-#endif
+#include <sys/mman.h>
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
@@ -159,17 +157,13 @@ THR_GetName(void)
/*--------------------------------------------------------------------
* Generic setup all our threads should call
*/
-#ifdef HAVE_SIGALTSTACK
static stack_t altstack;
-#endif
void
THR_Init(void)
{
-#ifdef HAVE_SIGALTSTACK
if (altstack.ss_sp != NULL)
AZ(sigaltstack(&altstack, NULL));
-#endif
}
/*--------------------------------------------------------------------
@@ -341,7 +335,6 @@ child_sigmagic(size_t altstksz)
memset(&sa, 0, sizeof sa);
-#ifdef HAVE_SIGALTSTACK
size_t sz = vmax_t(size_t, SIGSTKSZ + 4096, altstksz);
altstack.ss_sp = mmap(NULL, sz, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS,
@@ -351,9 +344,6 @@ child_sigmagic(size_t altstksz)
altstack.ss_size = sz;
altstack.ss_flags = 0;
sa.sa_flags |= SA_ONSTACK;
-#else
- (void)altstksz;
-#endif
THR_Init();
diff --git a/configure.ac b/configure.ac
index ac237ee97..92adda09c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,7 +225,6 @@ AC_CHECK_FUNCS([nanosleep])
AC_CHECK_FUNCS([setppriv])
AC_CHECK_FUNCS([fallocate])
AC_CHECK_FUNCS([closefrom])
-AC_CHECK_FUNCS([sigaltstack])
AC_CHECK_FUNCS([getpeereid])
AC_CHECK_FUNCS([getpeerucred])
AC_CHECK_FUNCS([fnmatch], [], [AC_MSG_ERROR([fnmatch(3) is required])])
More information about the varnish-commit
mailing list