httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r329591 - in /httpd/httpd/branches/2.2.x: docs/manual/mod/ docs/manual/programs/ server/mpm/ server/mpm/experimental/leader/ server/mpm/experimental/perchild/ server/mpm/experimental/threadpool/
Date Sun, 30 Oct 2005 17:05:37 GMT
Author: niq
Date: Sun Oct 30 09:05:26 2005
New Revision: 329591

URL: http://svn.apache.org/viewcvs?rev=329591&view=rev
Log:
Remove experimental MPMs that show no signs of going anywhere:
perchild, threadpool, leader

Removed:
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.html
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.html.de
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.html.ko.euc-kr
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.xml.de
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.xml.ko
    httpd/httpd/branches/2.2.x/docs/manual/mod/leader.xml.meta
    httpd/httpd/branches/2.2.x/docs/manual/mod/perchild.html
    httpd/httpd/branches/2.2.x/docs/manual/mod/perchild.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/perchild.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/perchild.xml.meta
    httpd/httpd/branches/2.2.x/docs/manual/mod/threadpool.html
    httpd/httpd/branches/2.2.x/docs/manual/mod/threadpool.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/threadpool.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/threadpool.xml.meta
    httpd/httpd/branches/2.2.x/server/mpm/experimental/leader/
    httpd/httpd/branches/2.2.x/server/mpm/experimental/perchild/
    httpd/httpd/branches/2.2.x/server/mpm/experimental/threadpool/
Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/allmodules.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml
    httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml
    httpd/httpd/branches/2.2.x/server/mpm/config.m4

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/allmodules.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/allmodules.xml?rev=329591&r1=329590&r2=329591&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/allmodules.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/allmodules.xml Sun Oct 30 09:05:26 2005
@@ -77,12 +77,9 @@
   <modulefile>beos.xml</modulefile>
   <modulefile>mpm_common.xml</modulefile>
   <modulefile>event.xml</modulefile>
-  <modulefile>leader.xml</modulefile>
   <modulefile>mpm_netware.xml</modulefile>
   <modulefile>mpmt_os2.xml</modulefile>
-  <modulefile>perchild.xml</modulefile>
   <modulefile>prefork.xml</modulefile>
-  <modulefile>threadpool.xml</modulefile>
   <modulefile>mpm_winnt.xml</modulefile>
   <modulefile>worker.xml</modulefile>
 </modulefilelist>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml?rev=329591&r1=329590&r2=329591&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml Sun Oct 30 09:05:26 2005
@@ -34,8 +34,8 @@
 <syntax>AcceptMutex Default|<var>method</var></syntax>
 <default>AcceptMutex Default</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -107,9 +107,9 @@
 <syntax>CoreDumpDirectory <var>directory</var></syntax>
 <default>See usage for the default setting</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpm_winnt</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>This controls the directory to which Apache attempts to
@@ -137,8 +137,8 @@
 <syntax>EnableExceptionHook On|Off</syntax>
 <default>EnableExceptionHook Off</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module>
+<modulelist>
+<module>prefork</module>
 <module>worker</module></modulelist>
 <compatibility>Available in version 2.0.49 and later</compatibility>
 
@@ -184,9 +184,9 @@
 <syntax>Group <var>unix-group</var></syntax>
 <default>Group #-1</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 <compatibility>Only valid in global server config since Apache
 2.0</compatibility>
 
@@ -241,10 +241,10 @@
 <syntax>PidFile <var>filename</var></syntax>
 <default>PidFile logs/httpd.pid</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_winnt</module><module>mpmt_os2</module>
-<module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>The <directive>PidFile</directive> directive sets the file to
@@ -281,10 +281,10 @@
 listens to</description>
 <syntax>Listen [<var>IP-address</var>:]<var>portnumber</var>
[<var>protocol</var>]</syntax>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<module>mpmt_os2</module>
+<module>prefork</module><module>worker</module>
 <module>event</module>
 </modulelist>
 <compatibility>Required directive since Apache 2.0<br/>
@@ -364,10 +364,10 @@
 <syntax>ListenBacklog <var>backlog</var></syntax>
 <default>ListenBacklog 511</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>The maximum length of the queue of pending connections.
@@ -390,8 +390,8 @@
 <syntax>LockFile <var>filename</var></syntax>
 <default>LockFile logs/accept.lock</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -423,8 +423,8 @@
 <syntax>MaxClients <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist><module>beos</module>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -463,9 +463,9 @@
 <syntax>MaxMemFree <var>KBytes</var></syntax>
 <default>MaxMemFree 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>prefork</module>
-<module>threadpool</module><module>worker</module><module>mpm_winnt</module></modulelist>
+<module>worker</module><module>mpm_winnt</module></modulelist>
 
 <usage>
     <p>The <directive>MaxMemFree</directive> directive sets the
@@ -482,10 +482,10 @@
 <syntax>MaxRequestsPerChild <var>number</var></syntax>
 <default>MaxRequestsPerChild 10000</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_netware</module>
+<modulelist><module>mpm_netware</module>
 <module>mpm_winnt</module><module>mpmt_os2</module>
-<module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>The <directive>MaxRequestsPerChild</directive> directive sets
@@ -526,23 +526,17 @@
 <syntax>MaxSpareThreads <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpmt_os2</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<module>worker</module>
 </modulelist>
 
 <usage>
     <p>Maximum number of idle threads. Different MPMs deal with this
     directive differently.</p>
 
-    <p>For <module>perchild</module> the default is
-    <code>MaxSpareThreads 10</code>. This MPM monitors the number of
-    idle threads on a per-child basis. If there are too many idle
-    threads in that child, the server will begin to kill threads
-    within that child.</p>
-
-    <p>For <module>worker</module>, <module>leader</module>
and <module
-    >threadpool</module> the default is <code>MaxSpareThreads 250</code>.
+    <p>For <module>worker</module>,
+    the default is <code>MaxSpareThreads 250</code>.
     These MPMs deal with idle threads on a server-wide basis. If there
     are too many idle threads in the server then child processes are
     killed until the number of idle threads is less than this number.</p>
@@ -561,14 +555,11 @@
       is restricted. Apache will correct the given value automatically
       according to the following rules:</p>
       <ul>
-        <li><module>perchild</module> requires <directive
-        >MaxSpareThreads</directive> to be less or equal than <directive
-        module="mpm_common">ThreadLimit</directive>.</li>
 
         <li><module>mpm_netware</module> wants the value to be greater
than
         <directive module="mpm_common">MinSpareThreads</directive>.</li>
 
-        <li>For <module>leader</module>, <module>threadpool</module>
and
+        <li>For
         <module>worker</module> the value must be greater or equal than
         the sum of <directive module="mpm_common">MinSpareThreads</directive>
         and <directive module="mpm_common">ThreadsPerChild</directive>.</li>
@@ -586,9 +577,9 @@
 <syntax>MinSpareThreads <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpmt_os2</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<module>worker</module>
 </modulelist>
 
 <usage>
@@ -596,17 +587,9 @@
     Different MPMs deal with this directive
     differently.</p>
 
-    <p><module>perchild</module> uses a default of
-    <code>MinSpareThreads 5</code> and monitors the number of idle
-    threads on a per-child basis. If there aren't enough idle threads
-    in that child, the server will begin to create new threads within
-    that child. Thus, if you set <directive module="perchild"
-    >NumServers</directive> to <code>10</code> and a <directive
-    >MinSpareThreads</directive> value of <code>5</code>, you'll have
-    at least 50 idle threads on your system.</p>
 
-    <p><module>worker</module>, <module>leader</module> and
-    <module>threadpool</module> use a default of <code>MinSpareThreads
+    <p><module>worker</module>
+     uses a default of <code>MinSpareThreads
     75</code> and deal with idle threads on a server-wide basis. If
     there aren't enough idle threads in the server then child
     processes are created until the number of idle threads is greater
@@ -632,9 +615,9 @@
 <syntax>ScoreBoardFile <var>file-path</var></syntax>
 <default>ScoreBoardFile logs/apache_status</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
-<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>beos</module>
+<module>mpm_winnt</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>Apache uses a scoreboard to communicate between its parent
@@ -667,10 +650,10 @@
 <syntax>ReceiveBufferSize <var>bytes</var></syntax>
 <default>ReceiveBufferSize 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>The server will set the TCP receive buffer size to the number of
@@ -687,10 +670,10 @@
 <syntax>SendBufferSize <var>bytes</var></syntax>
 <default>SendBufferSize 0</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>leader</module>
+<modulelist><module>beos</module>
 <module>mpm_netware</module><module>mpm_winnt</module>
-<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<module>mpmt_os2</module><module>prefork</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>The server will set the TCP send buffer size to the number of bytes
@@ -709,8 +692,8 @@
 <syntax>ServerLimit <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -742,8 +725,8 @@
     might want to set <directive
     module="mpm_common">MaxClients</directive> to.</p>
 
-    <p>With <module>worker</module>, <module>leader</module>
and
-    <module>threadpool</module> use this directive only
+    <p>With <module>worker</module>
+     use this directive only
     if your <directive module="mpm_common">MaxClients</directive> and
     <directive module="mpm_common">ThreadsPerChild</directive>
     settings require more than 16 server processes (default). Do not set
@@ -752,10 +735,6 @@
     module="mpm_common">MaxClients </directive> and <directive
     module="mpm_common">ThreadsPerChild</directive>.</p>
 
-    <p>With the <module>perchild</module> MPM, use this directive only
-    if you need to set <directive
-    module="perchild">NumServers</directive> higher than 8 (default).</p>
-
     <note><title>Note</title>
       <p>There is a hard limit of <code>ServerLimit 20000</code> compiled
       into the server (for the <module>prefork</module> MPM 200000). This is
@@ -771,8 +750,8 @@
 <syntax>StartServers <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpmt_os2</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist><module>mpmt_os2</module>
+<module>prefork</module><module>worker</module>
 </modulelist>
 
 <usage>
@@ -782,7 +761,6 @@
     there is usually little reason to adjust this parameter.</p>
 
     <p>The default value differs from MPM to MPM. For
-    <module>leader</module>, <module>threadpool</module> and
     <module>worker</module> the default is <code>StartServers 3</code>.
     For <module>prefork</module> defaults to <code>5</code> and for
     <module>mpmt_os2</module> to <code>2</code>.</p>
@@ -796,7 +774,7 @@
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>beos</module><module>mpm_netware</module>
-<module>perchild</module></modulelist>
+</modulelist>
 
 <usage>
     <p>Number of threads created on startup. As the
@@ -804,10 +782,6 @@
     load, there is usually little reason to adjust this
     parameter.</p>
 
-    <p>For <module>perchild</module> the default is <code>StartThreads
-    5</code> and this directive tracks the number of threads per
-    process at startup.</p>
-
     <p>For <module>mpm_netware</module> the default is
     <code>StartThreads 50</code> and, since there is only a single
     process, this is the total number of threads created at startup to
@@ -826,8 +800,8 @@
 <syntax>ThreadLimit <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_winnt</module>
-<module>perchild</module><module>threadpool</module><module>worker</module>
+<modulelist><module>mpm_winnt</module>
+<module>worker</module>
 </modulelist>
 <compatibility>Available for <module>mpm_winnt</module> in Apache 2.0.41
 and later</compatibility>
@@ -871,8 +845,8 @@
 <syntax>ThreadsPerChild <var>number</var></syntax>
 <default>See usage for details</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_winnt</module>
-<module>threadpool</module><module>worker</module></modulelist>
+<modulelist><module>mpm_winnt</module>
+<module>worker</module></modulelist>
 
 <usage>
     <p>This directive sets the number of threads created by each
@@ -897,9 +871,9 @@
 <syntax>ThreadStackSize <var>size</var></syntax>
 <default>65536 on NetWare; varies on other operating systems</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_netware</module>
-<module>mpm_winnt</module><module>perchild</module>
-<module>threadpool</module><module>worker</module>
+<modulelist><module>mpm_netware</module>
+<module>mpm_winnt</module>
+<module>worker</module>
 </modulelist>
 <compatibility>Available in Apache 2.1 and later</compatibility>
 
@@ -944,8 +918,8 @@
 <syntax>User <var>unix-userid</var></syntax>
 <default>User #-1</default>
 <contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>perchild</module>
-<module>prefork</module><module>threadpool</module><module>worker</module>
+<modulelist>
+<module>prefork</module><module>worker</module>
 </modulelist>
 <compatibility>Only valid in global server config since Apache
 2.0</compatibility>
@@ -982,13 +956,6 @@
       module="mpm_common">Group</directive>) to <code>root</code> unless
       you know exactly what you are doing, and what the dangers are.</p>
     </note>
-
-    <p>With the <module>perchild</module> MPM, which is intended to
-    server virtual hosts run under different user IDs, the
-    <directive>User</directive> directive defines the user ID for the
-    main server and the fallback for <directive type="section"
-    module="core">VirtualHost</directive> sections without an
-    <directive module="perchild">AssignUserID</directive> directive.</p>
 
     <p>Special note: Use of this directive in <directive module="core"
     type="section">VirtualHost</directive> is no longer supported. To

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml?rev=329591&r1=329590&r2=329591&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml Sun Oct 30 09:05:26 2005
@@ -327,8 +327,8 @@
           option to disable CGI support.</dd>
          
         <dt><code>--disable-cgid</code></dt>
-        <dd>When using the threaded MPMs <module>worker</module> or
-          <module>perchild</module> support for CGI scripts is provided by
+        <dd>When using the threaded MPMs <module>worker</module>
+          support for CGI scripts is provided by
           <module>mod_cgid</module> by default. To disable CGI support use
           this option.</dd>
 
@@ -663,9 +663,9 @@
           exactly one <a href="../mpm.html">Multi-Processing Module</a>.
           Otherwise the <a href="../mpm.html#defaults">default MPM</a> for
           your operating system will be taken. Possible MPMs are
-          <module>beos</module>, <module>leader</module>,
-          <module>mpmt_os2</module>, <module>perchild</module>,
-          <module>prefork</module>, <module>threadpool</module> and
+          <module>beos</module>,
+          <module>mpmt_os2</module>,
+          <module>prefork</module>, and
           <module>worker</module>.</dd>
       </dl>
     </section>

Modified: httpd/httpd/branches/2.2.x/server/mpm/config.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/config.m4?rev=329591&r1=329590&r2=329591&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/config.m4 (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/config.m4 Sun Oct 30 09:05:26 2005
@@ -1,7 +1,7 @@
 AC_MSG_CHECKING(which MPM to use)
 AC_ARG_WITH(mpm,
 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
-                          MPM={beos|event|worker|prefork|mpmt_os2|perchild|leader|threadpool}),[
+                          MPM={beos|event|worker|prefork|mpmt_os2}),[
   APACHE_MPM=$withval
 ],[
   if test "x$APACHE_MPM" = "x"; then
@@ -14,7 +14,7 @@
 	
 ap_mpm_is_threaded ()
 {
-    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm"
= "perchild" -o "$apache_cv_mpm" = "leader" -o "$apache_cv_mpm" = "threadpool" ; then
+    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" ; then
         return 0
     else
         return 1
@@ -23,7 +23,7 @@
 
 ap_mpm_is_experimental ()
 {
-    if test "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm"
= "leader" -o "$apache_cv_mpm" = "threadpool" ; then
+    if test "$apache_cv_mpm" = "event" ; then
         return 0
     else
         return 1



Mime
View raw message