Commit 37de80ba authored by Sascha Schumann's avatar Sascha Schumann
Browse files

Add ap_sigwait() to support old-style sigwait(). 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85101 13f79535-47bb-0310-9956-ffa450edef68
parent 77a65e61

acinclude.m4

+18 −0
Original line number Diff line number Diff line
@@ -177,6 +177,24 @@ unsigned long foo = INADDR_NONE; 
  fi

])



AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[

  AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[

  AC_TRY_COMPILE([

#include <signal.h>

],[

  sigset_t set;



  sigwait(&set);

],[

  ac_cv_sigwait_one_arg=yes

],[

  ac_cv_sigwait_one_arg=no

])])

  if test "$ac_cv_sigwait_one_arg" = "yes"; then

    AC_DEFINE(SIGWAIT_TAKES_ONE_ARG,1,[ ])

  fi

])



AC_DEFUN(APACHE_CHECK_SHM_RW,[

  AC_CACHE_CHECK([whether system defines SHM_R,SHM_W],ac_cv_shm_rw,[

  AC_TRY_COMPILE([

server/mpm/config.m4

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then 
  fi

fi



APACHE_CHECK_SIGWAIT_ONE_ARG

APACHE_CHECK_SHM_RW



APACHE_FAST_OUTPUT(modules/mpm/Makefile)

server/mpm/dexter/dexter.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static void child_main(int child_num_arg) 
    sigemptyset(&sig_mask);

    sigaddset(&sig_mask, SIGTERM);

    sigaddset(&sig_mask, SIGINT);

    sigwait(&sig_mask, &signal_received);

    ap_sigwait(&sig_mask, &signal_received);

    switch (signal_received) {

        case SIGTERM:

        case SIGINT:

server/mpm/mpmt_pthread/mpmt_pthread.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static void child_main(int child_num_arg) 
    sigemptyset(&sig_mask);

    sigaddset(&sig_mask, SIGTERM);

    sigaddset(&sig_mask, SIGINT);

    sigwait(&sig_mask, &signal_received);

    ap_sigwait(&sig_mask, &signal_received);

    switch (signal_received) {

        case SIGTERM:

        case SIGINT: