httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
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 GMT
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 @@
 <IfModule !mpm_simple_module>
 <IfModule !mpm_winnt_module>
 <IfModule !mpm_netware_module>
+<IfModule !mpm_mpmt_os2_module>
 LockFile "@rel_logfiledir@/accept.lock"
 </IfModule>
 </IfModule>
 </IfModule>
+</IfModule>
 
 
 #
@@ -88,6 +90,19 @@
     MaxMemFree             100
 </IfModule>
 
+# 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
+<IfModule mpm_mpmt_os2_module>
+    StartServers           2
+    MinSpareThreads        5
+    MaxSpareThreads       10
+    MaxRequestsPerChild    0
+</IfModule>
+
 # 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 @@
       <a href="../mpm.html">Multi-Processing Modules</a> (MPMs).
       When building Apache, you must choose an MPM to use.  There
       are platform-specific MPMs for some platforms:
-      <module>mpm_netware</module> and <module>mpm_winnt</module>.
 For
+      <module>mpm_netware</module>,
+      <module>mpmt_os2</module>, and <module>mpm_winnt</module>.
 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:</p>

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 @@
 <syntax>PidFile <var>filename</var></syntax>
 <default>PidFile logs/httpd.pid</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_winnt</module>
+<modulelist><module>mpm_winnt</module><module>mpmt_os2</module>
 <module>prefork</module><module>worker</module></modulelist>
 
 <usage>
@@ -253,6 +253,7 @@
 <syntax>Listen [<var>IP-address</var>:]<var>portnumber</var>
[<var>protocol</var>]</syntax>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module>
 <module>prefork</module><module>worker</module>
 <module>event</module>
 </modulelist>
@@ -335,7 +336,7 @@
 <contextlist><context>server config</context></contextlist>
 <modulelist>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>prefork</module>
+<module>mpmt_os2</module><module>prefork</module>
 <module>worker</module></modulelist>
 
 <usage>
@@ -456,7 +457,7 @@
 <default>MaxRequestsPerChild 10000</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>mpm_netware</module>
-<module>mpm_winnt</module>
+<module>mpm_winnt</module><module>mpmt_os2</module>
 <module>prefork</module><module>worker</module></modulelist>
 
 <usage>
@@ -491,7 +492,7 @@
 <syntax>MaxSpareThreads <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_netware</module>
+<modulelist><module>mpm_netware</module><module>mpmt_os2</module>
 <module>worker</module></modulelist>
 
 <usage>
@@ -508,6 +509,10 @@
     <code>MaxSpareThreads 100</code>. Since this MPM runs a
     single-process, the spare thread count is also server-wide.</p>
 
+    <p><module>mpmt_os2</module> works
+    similar to <module>mpm_netware</module>. For
+    <module>mpmt_os2</module> the default value is <code>10</code>.</p>
+
     <note><title>Restrictions</title>
       <p>The range of the <directive>MaxSpareThreads</directive> value
       is restricted. Apache will correct the given value automatically
@@ -533,7 +538,7 @@
 <syntax>MinSpareThreads <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_netware</module>
+<modulelist><module>mpm_netware</module><module>mpmt_os2</module>
 <module>worker</module></modulelist>
 
 <usage>
@@ -550,6 +555,10 @@
     <p><module>mpm_netware</module> uses a default of
     <code>MinSpareThreads 10</code> and, since it is a single-process
     MPM, tracks this on a server-wide bases.</p>
+
+    <p><module>mpmt_os2</module> works
+    similar to <module>mpm_netware</module>.  For
+    <module>mpmt_os2</module> the default value is <code>5</code>.</p>
 </usage>
 <seealso><directive module="mpm_common">MaxSpareThreads</directive></seealso>
 <seealso><directive module="mpm_common">StartServers</directive></seealso>
@@ -597,7 +606,7 @@
 <default>ReceiveBufferSize 0</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>mpm_netware</module><module>mpm_winnt</module>
-<module>prefork</module>
+<module>mpmt_os2</module><module>prefork</module>
 <module>worker</module></modulelist>
 
 <usage>
@@ -616,7 +625,7 @@
 <default>SendBufferSize 0</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>mpm_netware</module><module>mpm_winnt</module>
-<module>prefork</module>
+<module>mpmt_os2</module><module>prefork</module>
 <module>worker</module></modulelist>
 
 <usage>
@@ -692,7 +701,8 @@
 <syntax>StartServers <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>prefork</module><module>worker</module>
+<modulelist><module>mpmt_os2</module>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -703,7 +713,8 @@
 
     <p>The default value differs from MPM to MPM. <module>worker</module>
     defaults to <code>StartServers 3</code>; <module>prefork</module>

-    defaults to <code>5</code>.</p>
+    defaults to <code>5</code>; <module>mpmt_os2</module> defaults
to
+    <code>2</code>.</p>
 </usage>
 </directivesynopsis>
 

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 @@
 <table>
 <columnspec><column width=".2"/><column width=".2"/></columnspec>
 <tr><td>Netware</td><td><module>mpm_netware</module></td></tr>
+<tr><td>OS/2</td><td><module>mpmt_os2</module></td></tr>
 <tr><td>Unix</td><td><module>prefork</module></td></tr>
 <tr><td>Windows</td><td><module>mpm_winnt</module></td></tr>
 </table>

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



Mime
View raw message