Get rid of threaded MPM. This commit has the actual code changes.

The deletes come next.

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

diff --git a/CHANGES b/CHANGES
index 026557cceba47cd45a4747a06aefadd9810c5255..20435e5a640e70c01e08d2a4790ce977cfa4b46a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.29-dev
 
+  *) The threaded MPM for Unix has been removed.  Use the worker
+     MPM instead.  [various]
+
   *) APR-ize the resolver logic in mod_unique_id.  This fixes a bug
      in logging the error from a failed DNS lookup.  [Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index a0860fe01d5eafcaf4f4016632a2824dc1abb883..cd1969314876d206cfd858019fd0a01a0653312a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/11/19 13:48:57 $]
+Last modified at [$Date: 2001/11/19 18:07:27 $]
 
 Release:
 
@@ -191,7 +191,7 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
                 decoupled now, but isn't really sure.
 
     * Performance: Get the SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-      optimization working in threaded.  prefork's new design for how
+      optimization working in worker.  prefork's new design for how
       to notice data on the pod should be sufficient.
 
     * Performance & Debug: Eliminate most (and perhaps all) of the 
@@ -251,7 +251,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
                 prefer htpasswd:
                 prefer seperate: OtherBill
 
-
     * use apu_dbm in mod_auth_dbm
         Status: Greg +1 (low-priority volunteer)
         Justin says: "Seems like this is already there, so should we just 
@@ -315,16 +314,13 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
       search for libssl and libcrypto and properly add them to mod_ssl's
       link flags.
 
-    * Remove the threaded MPM.
-      +1:   Ryan, Justin, Jeff, Ian, Aaron, Cliff, Greg Ames
-      +0:
-      -1:
-
     * Make the worker MPM the default MPM for threaded Unix boxes.
       +1:   Justin, Jeff, Ian
       -0:   Aaron (premature decision, needs more discussion)
       -0:   Cliff (I think the default config should be the safest possible)
 
+    * The worker MPM needs some doc.
+
 PRs that have been suspended forever waiting for someone to
 put them into 'the next release':
 

diff --git a/docs/conf/highperformance-std.conf b/docs/conf/highperformance-std.conf
index b0060882a8f47e607ff8976c3f23d115e2a86ad9..2d356165166c75e8715a0eb51534e5a515bb983d 100755 (executable)
--- a/docs/conf/highperformance-std.conf
+++ b/docs/conf/highperformance-std.conf
@@ -26,14 +26,6 @@ MinSpareServers  5
 MaxSpareServers 10
 </IfModule>
 
-<IfModule threaded.c>
-MaxClients       8
-StartServers     3
-MinSpareThreads  5
-MaxSpareThreads 10
-ThreadsPerChild 25
-</IfModule>
-
 <IfModule worker.c>
 MaxClients       8
 StartServers     3

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 8fe1bac486d4d87c33d8b115e6d87fd741a735bf..698a197ada7f169bb066637d4b5672857273277f 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -117,22 +117,6 @@ MaxClients         150
 MaxRequestsPerChild  0
 </IfModule>
 
-# threaded MPM
-# StartServers: initial number of server processes to start
-# MaxClients: maximum number of server processes allowed to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule threaded.c>
-StartServers         3
-MaxClients         150
-MinSpareThreads     25
-MaxSpareThreads     75 
-ThreadsPerChild     25
-MaxRequestsPerChild  0
-</IfModule>
-
 # worker MPM
 # StartServers: initial number of server processes to start
 # MaxClients: maximum number of simultaneous client connections

diff --git a/docs/manual/mod/index-bytype.html b/docs/manual/mod/index-bytype.html
index d6cd33a7cd377aade22f79e546efee44af62320c..42a8f5314edd08656526c574c791341b9a75c963 100644 (file)
--- a/docs/manual/mod/index-bytype.html
+++ b/docs/manual/mod/index-bytype.html
@@ -28,7 +28,7 @@
 
       <dd>Core Apache features.</dd>
 
-      <dt><a href="threaded.html">threaded</a></dt>
+      <dt><a href="worker.html">worker</a></dt>
 
       <dd>Multi-Processing Module with Threading via Pthreads;
       Variable number of processes, constant number of

diff --git a/docs/manual/mod/index.html b/docs/manual/mod/index.html
index 40a1522fbfbf20cb222348ebc2e51034451b285e..895560fe192bb527cb12c2f84b9d6f2a925a3b29 100644 (file)
--- a/docs/manual/mod/index.html
+++ b/docs/manual/mod/index.html
@@ -28,7 +28,7 @@
 
       <dd>Core Apache features.</dd>
 
-      <dt><a href="threaded.html">threaded</a></dt>
+      <dt><a href="worker.html">worker</a></dt>
 
       <dd>Multi-Processing Module with Threading via Pthreads;
       Variable number of processes, constant number of

diff --git a/docs/manual/mod/mpm_common.html b/docs/manual/mod/mpm_common.html
index 11c2c3d6a47a3bd5e74af4c35ec3867b60654f10..6f532672508f45d96f99dd9f3d7a4a0f43d57006 100644 (file)
--- a/docs/manual/mod/mpm_common.html
+++ b/docs/manual/mod/mpm_common.html
@@ -99,7 +99,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork, mpm_winnt</p>
 
     <p>This controls the directory to which Apache attempts to
@@ -126,7 +126,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork</p>
     The Group directive sets the group under which the server will
     answer requests. In order to use this directive, the
@@ -173,7 +173,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork, mpm_winnt</p>
 
     <p>The PidFile directive sets the file to which the server
@@ -203,7 +203,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork, mpm_winnt</p>
 
     <p>The Listen directive instructs Apache to listen to only
@@ -260,7 +260,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork, mpm_winnt</p>
 
     <p>The maximum length of the queue of pending connections.
@@ -290,7 +290,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork</p>
 
     <p>The LockFile directive sets the path to the lockfile used
@@ -326,7 +326,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, prefork</p>
+    rel="Help"><strong>Module:</strong></a> worker, prefork</p>
 
     <p>The MaxClients directive sets the limit on the number of
     child processes that will be created to serve requests. When
@@ -363,7 +363,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, prefork,
+    rel="Help"><strong>Module:</strong></a> worker, prefork,
     perchild, mpm_winnt</p>
 
     <p>The MaxRequestsPerChild directive sets the limit on the
@@ -397,21 +397,21 @@
     <em>number</em><br />
      <a href="directive-dict.html#Default"
     rel="Help"><strong>Default:</strong></a> <code>MaxSpareThreads
-    10 (Perchild) or 500 (threaded)</code><br />
+    10 (Perchild) or 500 (worker)</code><br />
      <a href="directive-dict.html#Context"
     rel="Help"><strong>Context:</strong></a> server config<br />
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> core<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild</p>
+    rel="Help"><strong>Module:</strong></a> worker, perchild</p>
 
     <p>Maximum number of idle threads. Different MPMs deal with
-    this directive differently. Perchild monitor the number of idle
+    this directive differently. Perchild 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>threaded deals with idle threads on a server-wide basis. If
+    <p>worker deals 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>
@@ -434,7 +434,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> core<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild</p>
+    rel="Help"><strong>Module:</strong></a> worker, perchild</p>
 
     <p>Maximum number of threads per child. For MPMs with a
     variable number of threads per child, this directive sets the
@@ -453,21 +453,21 @@
     <em>number</em><br />
      <a href="directive-dict.html#Default"
     rel="Help"><strong>Default:</strong></a> <code>MaxSpareThreads
-    5 (Perchild) or 250 (threaded)</code><br />
+    5 (Perchild) or 250 (worker)</code><br />
      <a href="directive-dict.html#Context"
     rel="Help"><strong>Context:</strong></a> server config<br />
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> core<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild</p>
+    rel="Help"><strong>Module:</strong></a> worker, perchild</p>
 
     <p>Minimum number of idle threads to handle request spikes.
     Different MPMs deal with this directive differently. Perchild
-    monitor the number of idle threads on a per-child basis. If
+    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.</p>
 
-    <p>threaded deals with idle threads on a server-wide basis. If
+    <p>worker deals 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 than number.</p>
@@ -513,7 +513,7 @@
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Compatibility" rel="Help"></a> <a
     href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork</p>
 
     <p>The ScoreBoardFile directive is required on some
@@ -546,7 +546,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork, mpm_winnt</p>
     The server will set the TCP buffer size to the number of bytes
     specified. Very useful to increase past standard OS defaults on
@@ -569,7 +569,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, prefork</p>
+    rel="Help"><strong>Module:</strong></a> worker, prefork</p>
 
     <p>The StartServers directive sets the number of child server
     processes created on startup. As the number of processes is
@@ -616,14 +616,14 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> MPM<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, mpm_winnt</p>
+    rel="Help"><strong>Module:</strong></a> worker, mpm_winnt</p>
 
     <p>This directive sets the number of threads created by each
     child process. The child creates these threads at startup and
     never creates more. if using an MPM like mpmt_winnt, where
     there is only one child process, this number should be high
     enough to handle the entire load of the server. If using an MPM
-    like threaded, where there are multiple child processes, the
+    like worker, where there are multiple child processes, the
     total number of threads should be high enough to handle the
     common load on the server.</p>
     <hr />
@@ -643,7 +643,7 @@
      <a href="directive-dict.html#Status"
     rel="Help"><strong>Status:</strong></a> core<br />
      <a href="directive-dict.html#Module"
-    rel="Help"><strong>Module:</strong></a> threaded, perchild,
+    rel="Help"><strong>Module:</strong></a> worker, perchild,
     prefork</p>
     The User directive sets the userid as which the server will
     answer requests. In order to use this directive, the standalone

diff --git a/docs/manual/mpm.html b/docs/manual/mpm.html
index 93d04596653630247946d8d99bdd99264d0cb280..db67792034dcbb14eaeb622e2cd4cebe478c13d7 100644 (file)
--- a/docs/manual/mpm.html
+++ b/docs/manual/mpm.html
@@ -47,7 +47,7 @@
       <li>The server can be better customized for the needs of the
       particular site. For example, sites that need a great deal of
       scalability can choose to use a threaded MPM like <a
-      href="mod/threaded.html">threaded</a>, while sites requiring
+      href="mod/worker.html">worker</a>, while sites requiring
       stability or compatibility with older software can use a <a
       href="mod/prefork.html">preforking MPM</a>. In addition,
       special features like serving different hosts under different

diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index 93d04596653630247946d8d99bdd99264d0cb280..db67792034dcbb14eaeb622e2cd4cebe478c13d7 100644 (file)
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -47,7 +47,7 @@
       <li>The server can be better customized for the needs of the
       particular site. For example, sites that need a great deal of
       scalability can choose to use a threaded MPM like <a
-      href="mod/threaded.html">threaded</a>, while sites requiring
+      href="mod/worker.html">worker</a>, while sites requiring
       stability or compatibility with older software can use a <a
       href="mod/prefork.html">preforking MPM</a>. In addition,
       special features like serving different hosts under different

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index a4b37cea50e374f73fdb559fe8cff97cbcfe3cbb..7113018226e51057d30d6164f03c604283fc1491 100644 (file)
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -13,7 +13,7 @@ APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [
 
 APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
-if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then
+if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
 # if we are using a threaded MPM, we will get better performance with
 # mod_cgid, so make it the default.
     APACHE_MODULE(cgid, CGI scripts, , , yes)

diff --git a/server/mpm/MPM.NAMING b/server/mpm/MPM.NAMING
index 98ee19921d8579654f0c1c816ec6b22e2022cb77..328d713c6c3df6b684b957b4f8c519b83b266375 100644 (file)
--- a/server/mpm/MPM.NAMING
+++ b/server/mpm/MPM.NAMING
@@ -5,9 +5,6 @@ The following MPMs currently exist:
   perchild ...... Multi  Process Model with Threading.
                   Constant number of processes, variable number of threads
                   each child process can have a different uid/gid.  
-  threaded ...... Multi  Process Model with Threading.
-                  Variable number of processes, constant number of
-                  threads/child (= Apache/thread)
   spmt_os2 ...... Single Process Model with Threading on OS/2
   mpmt_os2 ...... Multi Process Model with Threading on OS/2
                   Constant number of processes, variable number of threads.

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index e8178176035b9dfad2432a44de37f1818f3ff688..887bef18e1cb4e4b03d8701970e429ded939b606 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -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|worker|threaded|prefork|spmt_os2|perchild}),[
+                          MPM={beos|worker|prefork|spmt_os2|perchild}),[
   APACHE_MPM=$withval
 ],[
   if test "x$APACHE_MPM" = "x"; then
@@ -12,7 +12,7 @@ AC_MSG_RESULT($APACHE_MPM)
 
 apache_cv_mpm=$APACHE_MPM
        
-if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
+if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
   APR_CHECK_APR_DEFINE(APR_HAS_THREADS, srclib/apr)
 
   if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then