httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
Date Fri, 19 May 2000 07:14:59 GMT
fielding    00/05/19 00:14:58

  Modified:    src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c
               src/modules/mpm/prefork prefork.c
  Log:
  Fix warnings on use of common prototypes.  Fix bug of printing a
  pointer to proc_t instead of the actual pid on error.
  
  Submitted by:	Jeff Trawick, Roy Fielding
  
  Revision  Changes    Path
  1.81      +2 -1      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- dexter.c	2000/05/19 01:05:22	1.80
  +++ dexter.c	2000/05/19 07:14:43	1.81
  @@ -68,6 +68,7 @@
   #include "http_connection.h"
   #include "ap_mpm.h"
   #include "unixd.h"
  +#include "mpm_common.h"
   #include "iol_socket.h"
   #include "ap_listen.h"
   #include "mpm_default.h"
  @@ -1022,7 +1023,7 @@
   		 */
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, errno, 
                                ap_server_conf,
  -			    "long lost child came home! (pid %d)", pid);
  +			    "long lost child came home! (pid %d)", actual_pid);
   	    }
   	    /* Don't perform idle maintenance when a child dies,
                * only do it when there's a timeout.  Remember only a
  
  
  
  1.74      +11 -6     apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- mpmt_pthread.c	2000/05/19 01:05:25	1.73
  +++ mpmt_pthread.c	2000/05/19 07:14:50	1.74
  @@ -69,6 +69,7 @@
   #include "http_connection.h"
   #include "ap_mpm.h"
   #include "unixd.h"
  +#include "mpm_common.h"
   #include "iol_socket.h"
   #include "ap_listen.h"
   #include "scoreboard.h" 
  @@ -294,7 +295,7 @@
   #endif
   #ifdef SIGABORT
   	if (sigaction(SIGABORT, &sa, NULL) < 0)
  -	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_ap_server_conf, "sigaction(SIGABORT)");
  +	    ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGABORT)");
   #endif
   #ifdef SIGABRT
   	if (sigaction(SIGABRT, &sa, NULL) < 0)
  @@ -1047,11 +1048,15 @@
   	    }
   	    else if (is_graceful) {
   		/* Great, we've probably just lost a slot in the
  -		    * scoreboard.  Somehow we don't know about this
  -		    * child.
  -		    */
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, ap_server_conf,
  -			    "long lost child came home! (pid %d)", pid);
  +		 * scoreboard.  Somehow we don't know about this child.
  +		 */
  +		ap_os_proc_t actual_pid;
  +
  +		ap_get_os_proc(&actual_pid, pid);
  +		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0,
  +		             ap_server_conf,
  +		             "long lost child came home! (pid %ld)",
  +		             (long)actual_pid);
   	    }
   	    /* Don't perform idle maintenance when a child dies,
                * only do it when there's a timeout.  Remember only a
  
  
  
  1.88      +1 -0      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- prefork.c	2000/05/19 01:05:26	1.87
  +++ prefork.c	2000/05/19 07:14:54	1.88
  @@ -101,6 +101,7 @@
   #include "scoreboard.h"
   #include "ap_mpm.h"
   #include "unixd.h"
  +#include "mpm_common.h"
   #include "iol_socket.h"
   #include "ap_listen.h"
   #include "ap_mmn.h"
  
  
  

Mime
View raw message