httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject [PATCH] clean up some warnings in mpms
Date Fri, 19 May 2000 03:48:35 GMT
Ryan, is mpm_common.h o.k.?  (silly question, but Ryan and I don't
usually come up with the same filename choices :) )

Good night (good grief?)...

? src/include/mpm_common.h
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 */

/* The purpose of this file is to store the code that MOST mpm's will need
 * this does not mean a function only goes into this file if every MPM needs
 * it.  It means that if a function is needed by more than one MPM, and
 * future maintenance would be served by making the code common, then the
 * function belongs here.
 *
 * This is going in src/main because it is not platform specific, it is
 * specific to multi-process servers, but NOT to Unix.  Which is why it
 * does not belong in src/os/unix
 */

#ifndef APACHE_MPM_COMMON_H
#define APACHE_MPM_COMMON_H

#ifdef __cplusplus
extern "C" {
#endif

void ap_reclaim_child_processes(int terminate);
ap_proc_t *ap_wait_or_timeout(ap_wait_t *status, ap_pool_t *p);

#ifdef __cplusplus
}
#endif

#endif /* !APACHE_MPM_COMMON_H */
Index: src/main/mpm_common.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/main/mpm_common.c,v
retrieving revision 1.3
diff -u -r1.3 mpm_common.c
--- mpm_common.c	2000/05/19 02:37:17	1.3
+++ mpm_common.c	2000/05/19 03:42:41
@@ -72,6 +72,7 @@
 #include "http_config.h"
 #include "http_log.h"
 #include "mpm.h"
+#include "mpm_common.h"
 
 #ifdef DEXTER_MPM
 #define CHILD_INFO_TABLE     ap_child_table
Index: src/modules/mpm/dexter/dexter.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.80
diff -u -r1.80 dexter.c
--- dexter.c	2000/05/19 01:05:22	1.80
+++ dexter.c	2000/05/19 03:42:43
@@ -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
Index: src/modules/mpm/mpmt_pthread/mpmt_pthread.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.73
diff -u -r1.73 mpmt_pthread.c
--- mpmt_pthread.c	2000/05/19 01:05:25	1.73
+++ mpmt_pthread.c	2000/05/19 03:42:44
@@ -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" 
@@ -1050,8 +1051,10 @@
 		    * scoreboard.  Somehow we don't know about this
 		    * child.
 		    */
+                int 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 %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
Index: src/modules/mpm/prefork/prefork.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.87
diff -u -r1.87 prefork.c
--- prefork.c	2000/05/19 01:05:26	1.87
+++ prefork.c	2000/05/19 03:42:47
@@ -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"


-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message