Commit 9cdef1e6 authored by Brian Havard's avatar Brian Havard
Browse files

New multi-process multi-threaded MPM for OS/2. Not fully polished but works 

better than spmt_os2 already (graceful restarts actually work). A summary
of the process/thread structure is provided in the comments at the start
of mpmt_os2.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90289 13f79535-47bb-0310-9956-ffa450edef68
parent 8852ad4f

server/mpm/mpmt_os2/Makefile.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 


LTLIBRARY_NAME    = libmpmt_os2.la

LTLIBRARY_SOURCES = mpmt_os2.c mpmt_os2_child.c



include $(top_srcdir)/build/ltlib.mk

server/mpm/mpmt_os2/config5.m4

0 → 100644
+5 −0
Original line number Diff line number Diff line 
if test "$MPM_NAME" = "mpmt_os2" ; then

    AC_CACHE_SAVE

    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)

    APR_ADDTO(CFLAGS,-Zmt)

fi

server/mpm/mpmt_os2/mpm.h

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/* ====================================================================

 * The Apache Software License, Version 1.1

 *

 * Copyright (c) 2000-2001 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.

 */



#ifndef APACHE_MPM_MPMT_OS2_H

#define APACHE_MPM_MPMT_OS2_H



#define MPMT_OS2_MPM



#include "httpd.h"

#include "mpm_default.h"

#include "scoreboard.h"



#define MPM_NAME "MPMT_OS2"



extern server_rec *ap_server_conf;

#define AP_MPM_WANT_SET_PIDFILE

#define AP_MPM_WANT_SET_MAX_REQUESTS



#endif /* APACHE_MPM_SPMT_OS2_H */

server/mpm/mpmt_os2/mpm_default.h

0 → 100644
+116 −0
Original line number Diff line number Diff line 
/* ====================================================================

 * The Apache Software License, Version 1.1

 *

 * Copyright (c) 2000-2001 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.

 */



#ifndef APACHE_MPM_DEFAULT_H

#define APACHE_MPM_DEFAULT_H



/* Number of servers processes to spawn off by default

 */

#ifndef DEFAULT_START_DAEMON

#define DEFAULT_START_DAEMON 2

#endif



/* We don't need many processes, 

 * they're only for redundancy in the event of a crash 

 */

#define HARD_SERVER_LIMIT 10



/* Limit on the total number of threads per process

 */

#ifndef HARD_THREAD_LIMIT

#define HARD_THREAD_LIMIT 256

#endif



/* Maximum number of *free* server threads --- more than this, and

 * they will die off.

 */



#ifndef DEFAULT_MAX_SPARE_THREAD

#define DEFAULT_MAX_SPARE_THREAD 10

#endif



/* Minimum --- fewer than this, and more will be created */



#ifndef DEFAULT_MIN_SPARE_THREAD

#define DEFAULT_MIN_SPARE_THREAD 5

#endif



/* Where the main/parent process's pid is logged */

#ifndef DEFAULT_PIDLOG

#define DEFAULT_PIDLOG "logs/httpd.pid"

#endif



/*

 * Interval, in microseconds, between scoreboard maintenance.

 */

#ifndef SCOREBOARD_MAINTENANCE_INTERVAL

#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000

#endif



/* Number of requests to try to handle in a single process.  If <= 0,

 * the children don't die off.

 */

#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD

#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000

#endif



/* AP_CHILD_THREAD_FROM_ID is used by the scoreboard.  */

#define AP_CHILD_THREAD_FROM_ID(i)    (i / HARD_THREAD_LIMIT), (i % HARD_THREAD_LIMIT)

#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_THREAD_LIMIT) + t)



#endif /* AP_MPM_DEFAULT_H */

server/mpm/mpmt_os2/mpmt_os2.c

0 → 100644
+587 −0

File added.

Preview size limit exceeded, changes collapsed.