httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/experimental/threadpool mpm.h threadpool.c
Date Thu, 26 Feb 2004 20:32:23 GMT
trawick     2004/02/26 12:32:23

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS configure.in
               include  Tag: APACHE_2_0_BRANCH ap_mpm.h mpm_common.h
               server   Tag: APACHE_2_0_BRANCH core.c mpm_common.c
               server/mpm/prefork Tag: APACHE_2_0_BRANCH mpm.h prefork.c
               server/mpm/worker Tag: APACHE_2_0_BRANCH mpm.h worker.c
               server/mpm/experimental/leader Tag: APACHE_2_0_BRANCH
                        leader.c mpm.h
               server/mpm/experimental/perchild Tag: APACHE_2_0_BRANCH
                        mpm.h perchild.c
               server/mpm/experimental/threadpool Tag: APACHE_2_0_BRANCH
                        mpm.h threadpool.c
  Log:
  merge this feature, and code cleanups for signal handlers,
  from 2.1-dev:
  
        Add fatal exception hook for use by diagnostic modules.  The hook
        is only available if the --enable-exception-hook configure parm
        is used and the EnableExceptionHook directive has been set to
        "on".
  
  Reviewed by:	stoddard, jerenkrantz, gregames
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.243 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.242
  retrieving revision 1.988.2.243
  diff -u -r1.988.2.242 -r1.988.2.243
  --- CHANGES	24 Feb 2004 09:16:58 -0000	1.988.2.242
  +++ CHANGES	26 Feb 2004 20:32:18 -0000	1.988.2.243
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.49
   
  +  *) Add fatal exception hook for use by diagnostic modules.  The hook
  +     is only available if the --enable-exception-hook configure parm 
  +     is used and the EnableExceptionHook directive has been set to 
  +     "on".  [Jeff Trawick]
  +
     *) Allow mod_auth_digest to work with sub-requests with different
        methods than the original request.  PR 25040.
        [Josh Dady <jpd indecisive.com>]
  
  
  
  1.751.2.708 +1 -10     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.707
  retrieving revision 1.751.2.708
  diff -u -r1.751.2.707 -r1.751.2.708
  --- STATUS	26 Feb 2004 20:30:26 -0000	1.751.2.707
  +++ STATUS	26 Feb 2004 20:32:19 -0000	1.751.2.708
  @@ -276,15 +276,6 @@
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.98&r2=1.99
         +1: trawick, stoddard
   
  -    * fatal exception hook and related signal handler cleanups
  -      This also fixes an issue for me on Solaris where the cgid daemon
  -      won't restart multiple times because of something different
  -      about the signal handling the second time it is started.  With
  -      this patch I can "kill -SEGV" the cgid daemon process a number
  -      of times and the daemon will be restarted each time.
  -      http://www.apache.org/~trawick/fatal_exception_20.patch
  -      +1: trawick, stoddard, jerenkrantz, gregames
  -
   CURRENT RELEASE NOTES:
   
       * Backwards compatibility is expected of future Apache 2.0 releases,
  
  
  
  1.232.2.13 +6 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.232.2.12
  retrieving revision 1.232.2.13
  diff -u -r1.232.2.12 -r1.232.2.13
  --- configure.in	27 Dec 2003 12:00:42 -0000	1.232.2.12
  +++ configure.in	26 Feb 2004 20:32:19 -0000	1.232.2.13
  @@ -368,6 +368,12 @@
       nonssl_listen_stmt_2="Listen [[::]]:@@Port@@"
   fi
   
  +AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception
hook),
  +[
  +    AC_DEFINE(AP_ENABLE_EXCEPTION_HOOK, 1,
  +              [Allow modules to run hook after a fatal exception])
  +])dnl
  +
   AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging
and compile time warnings),
   [
     APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
  
  
  
  No                   revision
  No                   revision
  1.33.2.7  +9 -0      httpd-2.0/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mpm.h,v
  retrieving revision 1.33.2.6
  retrieving revision 1.33.2.7
  diff -u -r1.33.2.6 -r1.33.2.7
  --- ap_mpm.h	9 Feb 2004 20:54:33 -0000	1.33.2.6
  +++ ap_mpm.h	26 Feb 2004 20:32:20 -0000	1.33.2.7
  @@ -163,4 +163,13 @@
   #define AP_MONCONTROL(x)
   #endif
   
  +#if AP_ENABLE_EXCEPTION_HOOK
  +typedef struct ap_exception_info_t {
  +    int sig;
  +    pid_t pid;
  +} ap_exception_info_t;
  +
  +AP_DECLARE_HOOK(int,fatal_exception,(ap_exception_info_t *ei))
  +#endif /*AP_ENABLE_EXCEPTION_HOOK*/
  +
   #endif
  
  
  
  1.39.2.8  +10 -0     httpd-2.0/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
  retrieving revision 1.39.2.7
  retrieving revision 1.39.2.8
  diff -u -r1.39.2.7 -r1.39.2.8
  --- mpm_common.h	9 Feb 2004 20:54:34 -0000	1.39.2.7
  +++ mpm_common.h	26 Feb 2004 20:32:20 -0000	1.39.2.8
  @@ -249,6 +249,16 @@
                                              const char *arg);
   #endif
   
  +#ifdef AP_MPM_WANT_FATAL_SIGNAL_HANDLER
  +extern apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *pconf);
  +extern apr_status_t ap_fatal_signal_child_setup(server_rec *s);
  +#endif
  +
  +#if AP_ENABLE_EXCEPTION_HOOK
  +extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy,
  +                                             const char *arg);
  +#endif
  +
   #ifdef __cplusplus
   }
   #endif
  
  
  
  No                   revision
  No                   revision
  1.225.2.15 +4 -0      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.225.2.14
  retrieving revision 1.225.2.15
  diff -u -r1.225.2.14 -r1.225.2.15
  --- core.c	9 Feb 2004 20:59:45 -0000	1.225.2.14
  +++ core.c	26 Feb 2004 20:32:21 -0000	1.225.2.15
  @@ -3242,6 +3242,10 @@
   AP_INIT_TAKE1("MaxMemFree", ap_mpm_set_max_mem_free, NULL, RSRC_CONF,
                 "Maximum number of 1k blocks a particular childs allocator may hold."),
   #endif
  +#if AP_ENABLE_EXCEPTION_HOOK
  +AP_INIT_TAKE1("EnableExceptionHook", ap_mpm_set_exception_hook, NULL, RSRC_CONF,
  +              "Controls whether exception hook may be called after a crash"),
  +#endif
   { NULL }
   };
   
  
  
  
  1.102.2.8 +161 -0    httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.102.2.7
  retrieving revision 1.102.2.8
  diff -u -r1.102.2.7 -r1.102.2.8
  --- mpm_common.c	9 Feb 2004 20:59:46 -0000	1.102.2.7
  +++ mpm_common.c	26 Feb 2004 20:32:21 -0000	1.102.2.8
  @@ -54,6 +54,9 @@
   #ifdef HAVE_GRP_H
   #include <grp.h>
   #endif
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
   
   #ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES
   void ap_reclaim_child_processes(int terminate)
  @@ -867,3 +870,161 @@
   }
   
   #endif /* AP_MPM_WANT_SET_MAX_MEM_FREE */
  +
  +#ifdef AP_MPM_WANT_FATAL_SIGNAL_HANDLER
  +
  +static pid_t parent_pid, my_pid;
  +apr_pool_t *pconf;
  +
  +#if AP_ENABLE_EXCEPTION_HOOK
  +
  +static int exception_hook_enabled;
  +
  +const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy,
  +                                      const char *arg)
  +{
  +    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  +    if (err != NULL) {
  +        return err;
  +    }
  +
  +    if (cmd->server->is_virtual) {
  +	return "EnableExceptionHook directive not allowed in <VirtualHost>";
  +    }
  +
  +    if (strcasecmp(arg, "on") == 0) {
  +        exception_hook_enabled = 1;
  +    }
  +    else if (strcasecmp(arg, "off") == 0) {
  +        exception_hook_enabled = 0;
  +    }
  +    else {
  +        return "parameter must be 'on' or 'off'";
  +    }
  +
  +    return NULL;
  +}
  +
  +APR_HOOK_STRUCT(
  +    APR_HOOK_LINK(fatal_exception)
  +)
  +
  +AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception,
  +                          (ap_exception_info_t *ei), (ei), OK, DECLINED)
  +
  +static void run_fatal_exception_hook(int sig)
  +{
  +    ap_exception_info_t ei = {0};
  +
  +    if (exception_hook_enabled &&
  +        geteuid() != 0 && 
  +        my_pid != parent_pid) {
  +        ei.sig = sig;
  +        ei.pid = my_pid;
  +        ap_run_fatal_exception(&ei);
  +    }
  +}
  +#endif /* AP_ENABLE_EXCEPTION_HOOK */
  +
  +/* handle all varieties of core dumping signals */
  +static void sig_coredump(int sig)
  +{
  +    apr_filepath_set(ap_coredump_dir, pconf);
  +    apr_signal(sig, SIG_DFL);
  +#if AP_ENABLE_EXCEPTION_HOOK
  +    run_fatal_exception_hook(sig);
  +#endif
  +    /* linuxthreads issue calling getpid() here:
  +     *   This comparison won't match if the crashing thread is
  +     *   some module's thread that runs in the parent process.
  +     *   The fallout, which is limited to linuxthreads:
  +     *   The special log message won't be written when such a
  +     *   thread in the parent causes the parent to crash.
  +     */
  +    if (getpid() == parent_pid) {
  +        ap_log_error(APLOG_MARK, APLOG_NOTICE,
  +                     0, ap_server_conf,
  +                     "seg fault or similar nasty error detected "
  +                     "in the parent process");
  +        /* XXX we can probably add some rudimentary cleanup code here,
  +         * like getting rid of the pid file.  If any additional bad stuff
  +         * happens, we are protected from recursive errors taking down the
  +         * system since this function is no longer the signal handler   GLA
  +         */
  +    }
  +    kill(getpid(), sig);
  +    /* At this point we've got sig blocked, because we're still inside
  +     * the signal handler.  When we leave the signal handler it will
  +     * be unblocked, and we'll take the signal... and coredump or whatever
  +     * is appropriate for this particular Unix.  In addition the parent
  +     * will see the real signal we received -- whereas if we called
  +     * abort() here, the parent would only see SIGABRT.
  +     */
  +}
  +
  +apr_status_t ap_fatal_signal_child_setup(server_rec *s)
  +{
  +    my_pid = getpid();
  +    return APR_SUCCESS;
  +}
  +
  +apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)
  +{
  +#ifndef NO_USE_SIGACTION
  +    struct sigaction sa;
  +
  +    sigemptyset(&sa.sa_mask);
  +    
  +#if defined(SA_ONESHOT)
  +    sa.sa_flags = SA_ONESHOT;
  +#elif defined(SA_RESETHAND)
  +    sa.sa_flags = SA_RESETHAND;
  +#else
  +    sa.sa_flags = 0;
  +#endif
  +
  +    sa.sa_handler = sig_coredump;
  +    if (sigaction(SIGSEGV, &sa, NULL) < 0)
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGSEGV)");
  +#ifdef SIGBUS
  +    if (sigaction(SIGBUS, &sa, NULL) < 0)
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGBUS)");
  +#endif
  +#ifdef SIGABORT
  +    if (sigaction(SIGABORT, &sa, NULL) < 0)
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGABORT)");
  +#endif
  +#ifdef SIGABRT
  +    if (sigaction(SIGABRT, &sa, NULL) < 0)
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGABRT)");
  +#endif
  +#ifdef SIGILL
  +    if (sigaction(SIGILL, &sa, NULL) < 0)
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGILL)");
  +#endif
  +
  +#else /* NO_USE_SIGACTION */
  +    
  +    apr_signal(SIGSEGV, sig_coredump);
  +#ifdef SIGBUS
  +    apr_signal(SIGBUS, sig_coredump);
  +#endif /* SIGBUS */
  +#ifdef SIGABORT
  +    apr_signal(SIGABORT, sig_coredump);
  +#endif /* SIGABORT */
  +#ifdef SIGABRT
  +    apr_signal(SIGABRT, sig_coredump);
  +#endif /* SIGABRT */
  +#ifdef SIGILL
  +    apr_signal(SIGILL, sig_coredump);
  +#endif /* SIGILL */
  +
  +#endif /* NO_USE_SIGACTION */
  +
  +    pconf = in_pconf;
  +    parent_pid = my_pid = getpid();
  +
  +    return APR_SUCCESS;
  +}
  +
  +#endif /* AP_MPM_WANT_FATAL_SIGNAL_HANDLER */
  
  
  
  No                   revision
  No                   revision
  1.21.2.5  +1 -0      httpd-2.0/server/mpm/prefork/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/mpm.h,v
  retrieving revision 1.21.2.4
  retrieving revision 1.21.2.5
  diff -u -r1.21.2.4 -r1.21.2.5
  --- mpm.h	9 Feb 2004 20:59:48 -0000	1.21.2.4
  +++ mpm.h	26 Feb 2004 20:32:21 -0000	1.21.2.5
  @@ -36,6 +36,7 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   #define AP_MPM_WANT_SIGNAL_SERVER
   #define AP_MPM_WANT_SET_MAX_MEM_FREE
  +#define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
   #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
   
   #define AP_MPM_USES_POD 1
  
  
  
  1.272.2.10 +8 -68     httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.272.2.9
  retrieving revision 1.272.2.10
  diff -u -r1.272.2.9 -r1.272.2.10
  --- prefork.c	10 Feb 2004 14:53:28 -0000	1.272.2.9
  +++ prefork.c	26 Feb 2004 20:32:21 -0000	1.272.2.10
  @@ -315,34 +315,6 @@
   }
   #endif
   
  -/* handle all varieties of core dumping signals */
  -static void sig_coredump(int sig)
  -{
  -    chdir(ap_coredump_dir);
  -    apr_signal(sig, SIG_DFL);
  -    /* linuxthreads issue calling getpid() here:
  -     *   This comparison won't match if the crashing thread is
  -     *   some module's thread that runs in the parent process.
  -     *   The fallout, which is limited to linuxthreads:
  -     *   The special log message won't be written when such a
  -     *   thread in the parent causes the parent to crash.
  -     */
  -    if (getpid() == parent_pid) {
  -            ap_log_error(APLOG_MARK, APLOG_NOTICE,
  -                         0, ap_server_conf,
  -                         "seg fault or similar nasty error detected "
  -                         "in the parent process");
  -    }
  -    kill(getpid(), sig);
  -    /* At this point we've got sig blocked, because we're still inside
  -     * the signal handler.  When we leave the signal handler it will
  -     * be unblocked, and we'll take the signal... and coredump or whatever
  -     * is appropriate for this particular Unix.  In addition the parent
  -     * will see the real signal we received -- whereas if we called
  -     * abort() here, the parent would only see SIGABRT.
  -     */
  -}
  -
   /*****************************************************************
    * Connection structures and accounting...
    */
  @@ -386,37 +358,16 @@
   {
   #ifndef NO_USE_SIGACTION
       struct sigaction sa;
  +#endif
   
  +    if (!one_process) {
  +        ap_fatal_signal_setup(ap_server_conf, pconf);
  +    }
  +
  +#ifndef NO_USE_SIGACTION
       sigemptyset(&sa.sa_mask);
       sa.sa_flags = 0;
   
  -    if (!one_process) {
  -	sa.sa_handler = sig_coredump;
  -#if defined(SA_ONESHOT)
  -	sa.sa_flags = SA_ONESHOT;
  -#elif defined(SA_RESETHAND)
  -	sa.sa_flags = SA_RESETHAND;
  -#endif
  -	if (sigaction(SIGSEGV, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGSEGV)");
  -#ifdef SIGBUS
  -	if (sigaction(SIGBUS, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGBUS)");
  -#endif
  -#ifdef SIGABORT
  -	if (sigaction(SIGABORT, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGABORT)");
  -#endif
  -#ifdef SIGABRT
  -	if (sigaction(SIGABRT, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGABRT)");
  -#endif
  -#ifdef SIGILL
  -	if (sigaction(SIGILL, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGILL)");
  -#endif
  -	sa.sa_flags = 0;
  -    }
       sa.sa_handler = sig_term;
       if (sigaction(SIGTERM, &sa, NULL) < 0)
   	ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGTERM)");
  @@ -451,19 +402,6 @@
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(" AP_SIG_GRACEFUL_STRING
")");
   #else
       if (!one_process) {
  -	apr_signal(SIGSEGV, sig_coredump);
  -#ifdef SIGBUS
  -	apr_signal(SIGBUS, sig_coredump);
  -#endif /* SIGBUS */
  -#ifdef SIGABORT
  -	apr_signal(SIGABORT, sig_coredump);
  -#endif /* SIGABORT */
  -#ifdef SIGABRT
  -	apr_signal(SIGABRT, sig_coredump);
  -#endif /* SIGABRT */
  -#ifdef SIGILL
  -	apr_signal(SIGILL, sig_coredump);
  -#endif /* SIGILL */
   #ifdef SIGXCPU
   	apr_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
  @@ -527,6 +465,8 @@
       ap_my_pid = getpid();
       csd = NULL;
       requests_this_child = 0;
  +
  +    ap_fatal_signal_child_setup(ap_server_conf);
   
       /* Get a sub context for global allocations in this child, so that
        * we can have cleanups occur when the child exits.
  
  
  
  No                   revision
  No                   revision
  1.14.2.5  +1 -0      httpd-2.0/server/mpm/worker/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/mpm.h,v
  retrieving revision 1.14.2.4
  retrieving revision 1.14.2.5
  diff -u -r1.14.2.4 -r1.14.2.5
  --- mpm.h	9 Feb 2004 20:59:48 -0000	1.14.2.4
  +++ mpm.h	26 Feb 2004 20:32:22 -0000	1.14.2.5
  @@ -34,6 +34,7 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   #define AP_MPM_WANT_SIGNAL_SERVER
   #define AP_MPM_WANT_SET_MAX_MEM_FREE
  +#define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
   #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
   
   #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
  
  
  
  1.133.2.11 +7 -79     httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.133.2.10
  retrieving revision 1.133.2.11
  diff -u -r1.133.2.10 -r1.133.2.11
  --- worker.c	10 Feb 2004 14:53:28 -0000	1.133.2.10
  +++ worker.c	26 Feb 2004 20:32:22 -0000	1.133.2.11
  @@ -337,40 +337,6 @@
       exit(code);
   }
   
  -/* handle all varieties of core dumping signals */
  -static void sig_coredump(int sig)
  -{
  -    apr_filepath_set(ap_coredump_dir, pconf);
  -    apr_signal(sig, SIG_DFL);
  -    /* linuxthreads issue calling getpid() here:
  -     *   This comparison won't match if the crashing thread is
  -     *   some module's thread that runs in the parent process.
  -     *   The fallout, which is limited to linuxthreads:
  -     *   The special log message won't be written when such a
  -     *   thread in the parent causes the parent to crash.
  -     */
  -    if (getpid() == parent_pid) {
  -        ap_log_error(APLOG_MARK, APLOG_NOTICE,
  -                     0, ap_server_conf,
  -                     "seg fault or similar nasty error detected "
  -                     "in the parent process");
  -        
  -        /* XXX we can probably add some rudimentary cleanup code here,
  -         * like getting rid of the pid file.  If any additional bad stuff
  -         * happens, we are protected from recursive errors taking down the
  -         * system since this function is no longer the signal handler   GLA
  -         */
  -    }
  -    kill(ap_my_pid, sig);
  -    /* At this point we've got sig blocked, because we're still inside
  -     * the signal handler.  When we leave the signal handler it will
  -     * be unblocked, and we'll take the signal... and coredump or whatever
  -     * is appropriate for this particular Unix.  In addition the parent
  -     * will see the real signal we received -- whereas if we called
  -     * abort() here, the parent would only see SIGABRT.
  -     */
  -}
  -
   static void just_die(int sig)
   {
       clean_child_exit(0);
  @@ -445,42 +411,16 @@
   {
   #ifndef NO_USE_SIGACTION
       struct sigaction sa;
  +#endif
  +
  +    if (!one_process) {
  +        ap_fatal_signal_setup(ap_server_conf, pconf);
  +    }
   
  +#ifndef NO_USE_SIGACTION
       sigemptyset(&sa.sa_mask);
       sa.sa_flags = 0;
   
  -    if (!one_process) {
  -        sa.sa_handler = sig_coredump;
  -#if defined(SA_ONESHOT)
  -        sa.sa_flags = SA_ONESHOT;
  -#elif defined(SA_RESETHAND)
  -        sa.sa_flags = SA_RESETHAND;
  -#endif
  -        if (sigaction(SIGSEGV, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGSEGV)");
  -#ifdef SIGBUS
  -        if (sigaction(SIGBUS, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGBUS)");
  -#endif
  -#ifdef SIGABORT
  -        if (sigaction(SIGABORT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABORT)");
  -#endif
  -#ifdef SIGABRT
  -        if (sigaction(SIGABRT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABRT)");
  -#endif
  -#ifdef SIGILL
  -        if (sigaction(SIGILL, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGILL)");
  -#endif
  -        sa.sa_flags = 0;
  -    }
       sa.sa_handler = sig_term;
       if (sigaction(SIGTERM, &sa, NULL) < 0)
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  @@ -522,19 +462,6 @@
                        "sigaction(" AP_SIG_GRACEFUL_STRING ")");
   #else
       if (!one_process) {
  -        apr_signal(SIGSEGV, sig_coredump);
  -#ifdef SIGBUS
  -        apr_signal(SIGBUS, sig_coredump);
  -#endif /* SIGBUS */
  -#ifdef SIGABORT
  -        apr_signal(SIGABORT, sig_coredump);
  -#endif /* SIGABORT */
  -#ifdef SIGABRT
  -        apr_signal(SIGABRT, sig_coredump);
  -#endif /* SIGABRT */
  -#ifdef SIGILL
  -        apr_signal(SIGILL, sig_coredump);
  -#endif /* SIGILL */
   #ifdef SIGXCPU
           apr_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
  @@ -1165,6 +1092,7 @@
                                      * child initializes
                                      */
       ap_my_pid = getpid();
  +    ap_fatal_signal_child_setup(ap_server_conf);
       apr_pool_create(&pchild, pconf);
   
       /*stuff to do before we switch id's, so we have permissions.*/
  
  
  
  No                   revision
  No                   revision
  1.26.2.9  +7 -79     httpd-2.0/server/mpm/experimental/leader/leader.c
  
  Index: leader.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
  retrieving revision 1.26.2.8
  retrieving revision 1.26.2.9
  diff -u -r1.26.2.8 -r1.26.2.9
  --- leader.c	10 Feb 2004 14:53:28 -0000	1.26.2.8
  +++ leader.c	26 Feb 2004 20:32:22 -0000	1.26.2.9
  @@ -422,40 +422,6 @@
       exit(code);
   }
   
  -/* handle all varieties of core dumping signals */
  -static void sig_coredump(int sig)
  -{
  -    apr_filepath_set(ap_coredump_dir, pconf);
  -    apr_signal(sig, SIG_DFL);
  -    /* linuxthreads issue calling getpid() here:
  -     *   This comparison won't match if the crashing thread is
  -     *   some module's thread that runs in the parent process.
  -     *   The fallout, which is limited to linuxthreads:
  -     *   The special log message won't be written when such a
  -     *   thread in the parent causes the parent to crash.
  -     */
  -    if (getpid() == parent_pid) {
  -        ap_log_error(APLOG_MARK, APLOG_NOTICE,
  -                     0, ap_server_conf,
  -                     "seg fault or similar nasty error detected "
  -                     "in the parent process");
  -        
  -        /* XXX we can probably add some rudimentary cleanup code here,
  -         * like getting rid of the pid file.  If any additional bad stuff
  -         * happens, we are protected from recursive errors taking down the
  -         * system since this function is no longer the signal handler   GLA
  -         */
  -    }
  -    kill(ap_my_pid, sig);
  -    /* At this point we've got sig blocked, because we're still inside
  -     * the signal handler.  When we leave the signal handler it will
  -     * be unblocked, and we'll take the signal... and coredump or whatever
  -     * is appropriate for this particular Unix.  In addition the parent
  -     * will see the real signal we received -- whereas if we called
  -     * abort() here, the parent would only see SIGABRT.
  -     */
  -}
  -
   static void just_die(int sig)
   {
       clean_child_exit(0);
  @@ -535,42 +501,16 @@
   {
   #ifndef NO_USE_SIGACTION
       struct sigaction sa;
  +#endif
  +
  +    if (!one_process) {
  +        ap_fatal_signal_setup(ap_server_conf, pconf);
  +    }
   
  +#ifndef NO_USE_SIGACTION
       sigemptyset(&sa.sa_mask);
       sa.sa_flags = 0;
   
  -    if (!one_process) {
  -        sa.sa_handler = sig_coredump;
  -#if defined(SA_ONESHOT)
  -        sa.sa_flags = SA_ONESHOT;
  -#elif defined(SA_RESETHAND)
  -        sa.sa_flags = SA_RESETHAND;
  -#endif
  -        if (sigaction(SIGSEGV, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGSEGV)");
  -#ifdef SIGBUS
  -        if (sigaction(SIGBUS, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGBUS)");
  -#endif
  -#ifdef SIGABORT
  -        if (sigaction(SIGABORT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABORT)");
  -#endif
  -#ifdef SIGABRT
  -        if (sigaction(SIGABRT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABRT)");
  -#endif
  -#ifdef SIGILL
  -        if (sigaction(SIGILL, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGILL)");
  -#endif
  -        sa.sa_flags = 0;
  -    }
       sa.sa_handler = sig_term;
       if (sigaction(SIGTERM, &sa, NULL) < 0)
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  @@ -612,19 +552,6 @@
                        "sigaction(" AP_SIG_GRACEFUL_STRING ")");
   #else
       if (!one_process) {
  -        apr_signal(SIGSEGV, sig_coredump);
  -#ifdef SIGBUS
  -        apr_signal(SIGBUS, sig_coredump);
  -#endif /* SIGBUS */
  -#ifdef SIGABORT
  -        apr_signal(SIGABORT, sig_coredump);
  -#endif /* SIGABORT */
  -#ifdef SIGABRT
  -        apr_signal(SIGABRT, sig_coredump);
  -#endif /* SIGABRT */
  -#ifdef SIGILL
  -        apr_signal(SIGILL, sig_coredump);
  -#endif /* SIGILL */
   #ifdef SIGXCPU
           apr_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
  @@ -1080,6 +1007,7 @@
                                     */
   
       ap_my_pid = getpid();
  +    ap_fatal_signal_child_setup(ap_server_conf);
       apr_pool_create(&pchild, pconf);
   
       /*stuff to do before we switch id's, so we have permissions.*/
  
  
  
  1.6.2.5   +1 -0      httpd-2.0/server/mpm/experimental/leader/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/mpm.h,v
  retrieving revision 1.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- mpm.h	9 Feb 2004 20:59:47 -0000	1.6.2.4
  +++ mpm.h	26 Feb 2004 20:32:22 -0000	1.6.2.5
  @@ -34,6 +34,7 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   #define AP_MPM_WANT_SIGNAL_SERVER
   #define AP_MPM_WANT_SET_MAX_MEM_FREE
  +#define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
   #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
   
   #define AP_MPM_USES_POD 1
  
  
  
  No                   revision
  No                   revision
  1.17.2.5  +1 -0      httpd-2.0/server/mpm/experimental/perchild/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/mpm.h,v
  retrieving revision 1.17.2.4
  retrieving revision 1.17.2.5
  diff -u -r1.17.2.4 -r1.17.2.5
  --- mpm.h	9 Feb 2004 20:59:47 -0000	1.17.2.4
  +++ mpm.h	26 Feb 2004 20:32:22 -0000	1.17.2.5
  @@ -34,6 +34,7 @@
   #define AP_MPM_WANT_SET_COREDUMPDIR
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   #define AP_MPM_WANT_SIGNAL_SERVER
  +#define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
   #define AP_MPM_USES_POD
   
   #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
  
  
  
  1.136.2.6 +7 -60     httpd-2.0/server/mpm/experimental/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
  retrieving revision 1.136.2.5
  retrieving revision 1.136.2.6
  diff -u -r1.136.2.5 -r1.136.2.6
  --- perchild.c	9 Feb 2004 20:59:47 -0000	1.136.2.5
  +++ perchild.c	26 Feb 2004 20:32:22 -0000	1.136.2.6
  @@ -281,21 +281,6 @@
       exit(code);
   }
   
  -/* handle all varieties of core dumping signals */
  -static void sig_coredump(int sig)
  -{
  -    chdir(ap_coredump_dir);
  -    apr_signal(sig, SIG_DFL);
  -    kill(getpid(), sig);
  -    /* At this point we've got sig blocked, because we're still inside
  -     * the signal handler.  When we leave the signal handler it will
  -     * be unblocked, and we'll take the signal... and coredump or whatever
  -     * is appropriate for this particular Unix.  In addition the parent
  -     * will see the real signal we received -- whereas if we called
  -     * abort() here, the parent would only see SIGABRT.
  -     */
  -}
  -
   static void just_die(int sig)
   {
       clean_child_exit(0);
  @@ -375,42 +360,16 @@
   {
   #ifndef NO_USE_SIGACTION
       struct sigaction sa;
  +#endif
   
  +    if (!one_process) {
  +        ap_fatal_signal_setup(ap_server_conf, pconf);
  +    }
  +
  +#ifndef NO_USE_SIGACTION
       sigemptyset(&sa.sa_mask);
       sa.sa_flags = 0;
   
  -    if (!one_process) {
  -        sa.sa_handler = sig_coredump;
  -#if defined(SA_ONESHOT)
  -        sa.sa_flags = SA_ONESHOT;
  -#elif defined(SA_RESETHAND)
  -        sa.sa_flags = SA_RESETHAND;
  -#endif
  -        if (sigaction(SIGSEGV, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  -                         "sigaction(SIGSEGV)");
  -#ifdef SIGBUS
  -        if (sigaction(SIGBUS, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  -                         "sigaction(SIGBUS)");
  -#endif
  -#ifdef SIGABORT
  -        if (sigaction(SIGABORT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  -                         "sigaction(SIGABORT)");
  -#endif
  -#ifdef SIGABRT
  -        if (sigaction(SIGABRT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  -                         "sigaction(SIGABRT)");
  -#endif
  -#ifdef SIGILL
  -        if (sigaction(SIGILL, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  -                         "sigaction(SIGILL)");
  -#endif
  -        sa.sa_flags = 0;
  -    }
       sa.sa_handler = sig_term;
       if (sigaction(SIGTERM, &sa, NULL) < 0)
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
  @@ -452,19 +411,6 @@
                        "sigaction(" AP_SIG_GRACEFUL_STRING ")");
   #else
       if (!one_process) {
  -        apr_signal(SIGSEGV, sig_coredump);
  -#ifdef SIGBUS
  -        apr_signal(SIGBUS, sig_coredump);
  -#endif /* SIGBUS */
  -#ifdef SIGABORT
  -        apr_signal(SIGABORT, sig_coredump);
  -#endif /* SIGABORT */
  -#ifdef SIGABRT
  -        apr_signal(SIGABRT, sig_coredump);
  -#endif /* SIGABRT */
  -#ifdef SIGILL
  -        apr_signal(SIGILL, sig_coredump);
  -#endif /* SIGILL */
   #ifdef SIGXCPU
           apr_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
  @@ -982,6 +928,7 @@
       ap_listen_rec *lr;
       
       my_pid = getpid();
  +    ap_fatal_signal_child_setup(ap_server_conf);
       child_num = child_num_arg;
       apr_pool_create(&pchild, pconf);
   
  
  
  
  No                   revision
  No                   revision
  1.3.2.5   +1 -0      httpd-2.0/server/mpm/experimental/threadpool/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/mpm.h,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- mpm.h	9 Feb 2004 20:59:47 -0000	1.3.2.4
  +++ mpm.h	26 Feb 2004 20:32:23 -0000	1.3.2.5
  @@ -34,6 +34,7 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
   #define AP_MPM_WANT_SIGNAL_SERVER
   #define AP_MPM_WANT_SET_MAX_MEM_FREE
  +#define AP_MPM_WANT_FATAL_SIGNAL_HANDLER
   #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
   
   #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
  
  
  
  1.14.2.10 +7 -79     httpd-2.0/server/mpm/experimental/threadpool/threadpool.c
  
  Index: threadpool.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
  retrieving revision 1.14.2.9
  retrieving revision 1.14.2.10
  diff -u -r1.14.2.9 -r1.14.2.10
  --- threadpool.c	10 Feb 2004 14:53:28 -0000	1.14.2.9
  +++ threadpool.c	26 Feb 2004 20:32:23 -0000	1.14.2.10
  @@ -498,40 +498,6 @@
       exit(code);
   }
   
  -/* handle all varieties of core dumping signals */
  -static void sig_coredump(int sig)
  -{
  -    apr_filepath_set(ap_coredump_dir, pconf);
  -    apr_signal(sig, SIG_DFL);
  -    /* linuxthreads issue calling getpid() here:
  -     *   This comparison won't match if the crashing thread is
  -     *   some module's thread that runs in the parent process.
  -     *   The fallout, which is limited to linuxthreads:
  -     *   The special log message won't be written when such a
  -     *   thread in the parent causes the parent to crash.
  -     */
  -    if (getpid() == parent_pid) {
  -        ap_log_error(APLOG_MARK, APLOG_NOTICE,
  -                     0, ap_server_conf,
  -                     "seg fault or similar nasty error detected "
  -                     "in the parent process");
  -        
  -        /* XXX we can probably add some rudimentary cleanup code here,
  -         * like getting rid of the pid file.  If any additional bad stuff
  -         * happens, we are protected from recursive errors taking down the
  -         * system since this function is no longer the signal handler   GLA
  -         */
  -    }
  -    kill(ap_my_pid, sig);
  -    /* At this point we've got sig blocked, because we're still inside
  -     * the signal handler.  When we leave the signal handler it will
  -     * be unblocked, and we'll take the signal... and coredump or whatever
  -     * is appropriate for this particular Unix.  In addition the parent
  -     * will see the real signal we received -- whereas if we called
  -     * abort() here, the parent would only see SIGABRT.
  -     */
  -}
  -
   static void just_die(int sig)
   {
       clean_child_exit(0);
  @@ -606,42 +572,16 @@
   {
   #ifndef NO_USE_SIGACTION
       struct sigaction sa;
  +#endif
  +
  +    if (!one_process) {
  +        ap_fatal_signal_setup(ap_server_conf, pconf);
  +    }
   
  +#ifndef NO_USE_SIGACTION
       sigemptyset(&sa.sa_mask);
       sa.sa_flags = 0;
   
  -    if (!one_process) {
  -        sa.sa_handler = sig_coredump;
  -#if defined(SA_ONESHOT)
  -        sa.sa_flags = SA_ONESHOT;
  -#elif defined(SA_RESETHAND)
  -        sa.sa_flags = SA_RESETHAND;
  -#endif
  -        if (sigaction(SIGSEGV, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGSEGV)");
  -#ifdef SIGBUS
  -        if (sigaction(SIGBUS, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGBUS)");
  -#endif
  -#ifdef SIGABORT
  -        if (sigaction(SIGABORT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABORT)");
  -#endif
  -#ifdef SIGABRT
  -        if (sigaction(SIGABRT, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGABRT)");
  -#endif
  -#ifdef SIGILL
  -        if (sigaction(SIGILL, &sa, NULL) < 0)
  -            ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  -                         "sigaction(SIGILL)");
  -#endif
  -        sa.sa_flags = 0;
  -    }
       sa.sa_handler = sig_term;
       if (sigaction(SIGTERM, &sa, NULL) < 0)
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, 
  @@ -683,19 +623,6 @@
                        "sigaction(" AP_SIG_GRACEFUL_STRING ")");
   #else
       if (!one_process) {
  -        apr_signal(SIGSEGV, sig_coredump);
  -#ifdef SIGBUS
  -        apr_signal(SIGBUS, sig_coredump);
  -#endif /* SIGBUS */
  -#ifdef SIGABORT
  -        apr_signal(SIGABORT, sig_coredump);
  -#endif /* SIGABORT */
  -#ifdef SIGABRT
  -        apr_signal(SIGABRT, sig_coredump);
  -#endif /* SIGABRT */
  -#ifdef SIGILL
  -        apr_signal(SIGILL, sig_coredump);
  -#endif /* SIGILL */
   #ifdef SIGXCPU
           apr_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
  @@ -1294,6 +1221,7 @@
                                      * child initializes
                                      */
       ap_my_pid = getpid();
  +    ap_fatal_signal_child_setup(ap_server_conf);
       apr_pool_create(&pchild, pconf);
   
       /*stuff to do before we switch id's, so we have permissions.*/
  
  
  

Mime
View raw message