Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 81253 invoked from network); 16 Aug 2009 12:03:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Aug 2009 12:03:59 -0000 Received: (qmail 8718 invoked by uid 500); 16 Aug 2009 12:04:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 8626 invoked by uid 500); 16 Aug 2009 12:04:05 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 8617 invoked by uid 99); 16 Aug 2009 12:04:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Aug 2009 12:04:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Aug 2009 12:03:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C3C323888ED; Sun, 16 Aug 2009 12:03:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r804678 - in /httpd/httpd/trunk: ./ docs/conf/extra/ docs/manual/ docs/manual/misc/ docs/manual/mod/ server/mpm/ server/mpm/mpmt_os2/ Date: Sun, 16 Aug 2009 12:03:34 -0000 To: cvs@httpd.apache.org From: bjh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090816120335.2C3C323888ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bjh Date: Sun Aug 16 12:03:34 2009 New Revision: 804678 URL: http://svn.apache.org/viewvc?rev=804678&view=rev Log: Bring OS/2 MPM back from the dead. Reverses r758899. Added: httpd/httpd/trunk/docs/manual/mod/mpmt_os2.html - copied unchanged from r758898, httpd/httpd/trunk/docs/manual/mod/mpmt_os2.html httpd/httpd/trunk/docs/manual/mod/mpmt_os2.html.en - copied unchanged from r758898, httpd/httpd/trunk/docs/manual/mod/mpmt_os2.html.en httpd/httpd/trunk/docs/manual/mod/mpmt_os2.xml - copied unchanged from r758898, httpd/httpd/trunk/docs/manual/mod/mpmt_os2.xml httpd/httpd/trunk/docs/manual/mod/mpmt_os2.xml.meta - copied unchanged from r758898, httpd/httpd/trunk/docs/manual/mod/mpmt_os2.xml.meta httpd/httpd/trunk/server/mpm/mpmt_os2/ (props changed) - copied from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/ httpd/httpd/trunk/server/mpm/mpmt_os2/Makefile.in - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/Makefile.in httpd/httpd/trunk/server/mpm/mpmt_os2/config5.m4 - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/config5.m4 httpd/httpd/trunk/server/mpm/mpmt_os2/mpm.h - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/mpm.h httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c - copied unchanged from r758898, httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c Modified: httpd/httpd/trunk/LAYOUT httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml httpd/httpd/trunk/docs/manual/mod/mpm_common.xml httpd/httpd/trunk/docs/manual/mpm.xml httpd/httpd/trunk/server/mpm/MPM.NAMING Modified: httpd/httpd/trunk/LAYOUT URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/LAYOUT?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/LAYOUT (original) +++ httpd/httpd/trunk/LAYOUT Sun Aug 16 12:03:34 2009 @@ -153,6 +153,8 @@ event/ .................. + mpmt_os2/ ............... + netware/ ................ prefork/ ................ Modified: httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in (original) +++ httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in Sun Aug 16 12:03:34 2009 @@ -18,10 +18,12 @@ + LockFile "@rel_logfiledir@/accept.lock" + # @@ -88,6 +90,19 @@ MaxMemFree 100 +# OS/2 MPM +# StartServers: Number of server processes to maintain +# MinSpareThreads: Minimum number of idle threads per process, +# to handle request spikes +# MaxSpareThreads: Maximum number of idle threads per process +# MaxRequestsPerChild: Maximum number of connections per server process + + StartServers 2 + MinSpareThreads 5 + MaxSpareThreads 10 + MaxRequestsPerChild 0 + + # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml (original) +++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml Sun Aug 16 12:03:34 2009 @@ -432,7 +432,8 @@ Multi-Processing Modules (MPMs). When building Apache, you must choose an MPM to use. There are platform-specific MPMs for some platforms: - mpm_netware and mpm_winnt. For + mpm_netware, + mpmt_os2, and mpm_winnt. For general Unix-type systems, there are several MPMs from which to choose. The choice of MPM can affect the speed and scalability of the httpd:

Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml (original) +++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml Sun Aug 16 12:03:34 2009 @@ -214,7 +214,7 @@ PidFile filename PidFile logs/httpd.pid server config -mpm_winnt +mpm_winntmpmt_os2 preforkworker @@ -253,6 +253,7 @@ Listen [IP-address:]portnumber [protocol] server config mpm_netwarempm_winnt +mpmt_os2 preforkworker event @@ -335,7 +336,7 @@ server config mpm_netwarempm_winnt -prefork +mpmt_os2prefork worker @@ -456,7 +457,7 @@ MaxRequestsPerChild 10000 server config mpm_netware -mpm_winnt +mpm_winntmpmt_os2 preforkworker @@ -491,7 +492,7 @@ MaxSpareThreads number See usage for details server config -mpm_netware +mpm_netwarempmt_os2 worker @@ -508,6 +509,10 @@ MaxSpareThreads 100. Since this MPM runs a single-process, the spare thread count is also server-wide.

+

mpmt_os2 works + similar to mpm_netware. For + mpmt_os2 the default value is 10.

+ Restrictions

The range of the MaxSpareThreads value is restricted. Apache will correct the given value automatically @@ -533,7 +538,7 @@ MinSpareThreads number See usage for details server config -mpm_netware +mpm_netwarempmt_os2 worker @@ -550,6 +555,10 @@

mpm_netware uses a default of MinSpareThreads 10 and, since it is a single-process MPM, tracks this on a server-wide bases.

+ +

mpmt_os2 works + similar to mpm_netware. For + mpmt_os2 the default value is 5.

 MaxSpareThreads StartServers @@ -597,7 +606,7 @@ ReceiveBufferSize 0 server config mpm_netwarempm_winnt -prefork +mpmt_os2prefork worker @@ -616,7 +625,7 @@ SendBufferSize 0 server config mpm_netwarempm_winnt -prefork +mpmt_os2prefork worker @@ -692,7 +701,8 @@ StartServers number See usage for details server config -preforkworker +mpmt_os2 +preforkworker @@ -703,7 +713,8 @@

The default value differs from MPM to MPM. worker defaults to StartServers 3; prefork - defaults to 5.

+ defaults to 5; mpmt_os2 defaults to + 2.

 Modified: httpd/httpd/trunk/docs/manual/mpm.xml URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mpm.xml?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mpm.xml (original) +++ httpd/httpd/trunk/docs/manual/mpm.xml Sun Aug 16 12:03:34 2009 @@ -102,6 +102,7 @@ +
Netwarempm_netware
OS/2mpmt_os2
Unixprefork
Windowsmpm_winnt
Modified: httpd/httpd/trunk/server/mpm/MPM.NAMING URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/MPM.NAMING?rev=804678&r1=804677&r2=804678&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm/MPM.NAMING (original) +++ httpd/httpd/trunk/server/mpm/MPM.NAMING Sun Aug 16 12:03:34 2009 @@ -5,6 +5,9 @@ depending on configuration and operating systems. Should be able to run on all modern operating systems. prefork ....... Multi Process Model with Preforking (Apache 1.3) + mpmt_os2 ...... Multi Process Model with Threading on OS/2 + Constant number of processes, variable number of threads. + One acceptor thread per process, multiple workers threads. winnt ......... Single Process Model with Threading on Windows NT worker ........ Multi Process model with threads. One acceptor thread, multiple worker threads. Propchange: httpd/httpd/trunk/server/mpm/mpmt_os2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 16 12:03:34 2009 @@ -0,0 +1,5 @@ +*.lo +*.la +Makefile +.deps +.libs