You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/03/26 19:48:15 UTC
svn commit: r758796 - in /httpd/httpd/trunk: ./ docs/conf/extra/
docs/manual/ docs/manual/misc/ docs/manual/mod/ docs/manual/programs/
server/mpm/ server/mpm/beos/
Author: trawick
Date: Thu Mar 26 18:48:10 2009
New Revision: 758796
URL: http://svn.apache.org/viewvc?rev=758796&view=rev
Log:
axe BeOS MPM
Removed:
httpd/httpd/trunk/docs/manual/mod/beos.html
httpd/httpd/trunk/docs/manual/mod/beos.html.de
httpd/httpd/trunk/docs/manual/mod/beos.html.en
httpd/httpd/trunk/docs/manual/mod/beos.html.es
httpd/httpd/trunk/docs/manual/mod/beos.html.ko.euc-kr
httpd/httpd/trunk/docs/manual/mod/beos.xml
httpd/httpd/trunk/docs/manual/mod/beos.xml.de
httpd/httpd/trunk/docs/manual/mod/beos.xml.es
httpd/httpd/trunk/docs/manual/mod/beos.xml.ko
httpd/httpd/trunk/docs/manual/mod/beos.xml.meta
httpd/httpd/trunk/server/mpm/beos/
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/docs/manual/programs/configure.xml
httpd/httpd/trunk/server/mpm/MPM.NAMING
Modified: httpd/httpd/trunk/LAYOUT
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/LAYOUT?rev=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/LAYOUT (original)
+++ httpd/httpd/trunk/LAYOUT Thu Mar 26 18:48:10 2009
@@ -159,8 +159,6 @@
mpm/ ....................
- beos/ ...................
-
experimental/ ...........
event/ .................
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=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in (original)
+++ httpd/httpd/trunk/docs/conf/extra/httpd-mpm.conf.in Thu Mar 26 18:48:10 2009
@@ -19,13 +19,11 @@
<IfModule !mpm_winnt_module>
<IfModule !mpm_netware_module>
<IfModule !mpm_mpmt_os2_module>
-<IfModule !mpm_beos_module>
LockFile "@rel_logfiledir@/accept.lock"
</IfModule>
</IfModule>
</IfModule>
</IfModule>
-</IfModule>
#
@@ -72,16 +70,6 @@
MaxRequestsPerChild 0
</IfModule>
-# BeOS MPM
-# StartThreads: how many threads do we initially spawn?
-# MaxClients: max number of threads we can have (1 thread == 1 client)
-# MaxRequestsPerThread: maximum number of requests each thread will process
-<IfModule mpm_beos_module>
- StartThreads 10
- MaxClients 50
- MaxRequestsPerThread 10000
-</IfModule>
-
# NetWare MPM
# ThreadStackSize: Stack size allocated for each worker thread
# StartThreads: Number of worker threads launched at server startup
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=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml Thu Mar 26 18:48:10 2009
@@ -432,7 +432,7 @@
<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>beos</module>, <module>mpm_netware</module>,
+ <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
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=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml Thu Mar 26 18:48:10 2009
@@ -124,8 +124,7 @@
<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>mpm_winnt</module><module>prefork</module>
+<modulelist><module>mpm_winnt</module><module>prefork</module>
<module>worker</module></modulelist>
<usage>
@@ -200,8 +199,7 @@
<syntax>PidFile <var>filename</var></syntax>
<default>PidFile logs/httpd.pid</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_winnt</module><module>mpmt_os2</module>
+<modulelist><module>mpm_winnt</module><module>mpmt_os2</module>
<module>prefork</module><module>worker</module></modulelist>
<usage>
@@ -239,8 +237,7 @@
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>mpm_netware</module><module>mpm_winnt</module>
+<modulelist><module>mpm_netware</module><module>mpm_winnt</module>
<module>mpmt_os2</module>
<module>prefork</module><module>worker</module>
<module>event</module>
@@ -322,7 +319,7 @@
<syntax>ListenBacklog <var>backlog</var></syntax>
<default>ListenBacklog 511</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
+<modulelist>
<module>mpm_netware</module><module>mpm_winnt</module>
<module>mpmt_os2</module><module>prefork</module>
<module>worker</module></modulelist>
@@ -388,8 +385,7 @@
<syntax>MaxClients <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>prefork</module><module>worker</module>
+<modulelist><module>prefork</module><module>worker</module>
</modulelist>
<usage>
@@ -407,11 +403,10 @@
The default value is <code>256</code>; to increase it, you must also raise
<directive module="mpm_common">ServerLimit</directive>.</p>
- <p>For threaded and hybrid servers (<em>e.g.</em> <module>beos</module>
+ <p>For threaded and hybrid servers (<em>e.g.</em> <module>event</module>
or <module>worker</module>) <directive>MaxClients</directive> restricts
the total number of threads that will be available to serve clients.
- The default value for <module>beos</module> is <code>50</code>. For
- hybrid MPMs the default value is <code>16</code> (<directive
+ For hybrid MPMs the default value is <code>16</code> (<directive
module="mpm_common">ServerLimit</directive>) multiplied by the value of
<code>25</code> (<directive module="mpm_common"
>ThreadsPerChild</directive>). Therefore, to increase <directive
@@ -428,8 +423,7 @@
<syntax>MaxMemFree <var>KBytes</var></syntax>
<default>MaxMemFree 0</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_netware</module><module>prefork</module>
+<modulelist><module>mpm_netware</module><module>prefork</module>
<module>worker</module><module>mpm_winnt</module></modulelist>
<usage>
@@ -483,8 +477,7 @@
<syntax>MaxSpareThreads <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_netware</module><module>mpmt_os2</module>
+<modulelist><module>mpm_netware</module><module>mpmt_os2</module>
<module>worker</module></modulelist>
<usage>
@@ -501,9 +494,8 @@
<code>MaxSpareThreads 100</code>. Since this MPM runs a
single-process, the spare thread count is also server-wide.</p>
- <p><module>beos</module> and <module>mpmt_os2</module> work
- similar to <module>mpm_netware</module>. The default for
- <module>beos</module> is <code>MaxSpareThreads 50</code>. For
+ <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>
@@ -531,8 +523,7 @@
<syntax>MinSpareThreads <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_netware</module><module>mpmt_os2</module>
+<modulelist><module>mpm_netware</module><module>mpmt_os2</module>
<module>worker</module></modulelist>
<usage>
@@ -550,9 +541,8 @@
<code>MinSpareThreads 10</code> and, since it is a single-process
MPM, tracks this on a server-wide bases.</p>
- <p><module>beos</module> and <module>mpmt_os2</module> work
- similar to <module>mpm_netware</module>. The default for
- <module>beos</module> is <code>MinSpareThreads 1</code>. For
+ <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>
@@ -566,8 +556,7 @@
<syntax>ScoreBoardFile <var>file-path</var></syntax>
<default>ScoreBoardFile logs/apache_status</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_winnt</module><module>prefork</module>
+<modulelist><module>mpm_winnt</module><module>prefork</module>
<module>worker</module></modulelist>
<usage>
@@ -601,8 +590,7 @@
<syntax>ReceiveBufferSize <var>bytes</var></syntax>
<default>ReceiveBufferSize 0</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_netware</module><module>mpm_winnt</module>
+<modulelist><module>mpm_netware</module><module>mpm_winnt</module>
<module>mpmt_os2</module><module>prefork</module>
<module>worker</module></modulelist>
@@ -621,8 +609,7 @@
<syntax>SendBufferSize <var>bytes</var></syntax>
<default>SendBufferSize 0</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module>
-<module>mpm_netware</module><module>mpm_winnt</module>
+<modulelist><module>mpm_netware</module><module>mpm_winnt</module>
<module>mpmt_os2</module><module>prefork</module>
<module>worker</module></modulelist>
@@ -722,8 +709,7 @@
<syntax>StartThreads <var>number</var></syntax>
<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>beos</module><module>mpm_netware</module>
-</modulelist>
+<modulelist><module>mpm_netware</module></modulelist>
<usage>
<p>Number of threads created on startup. As the
@@ -735,10 +721,6 @@
<code>StartThreads 50</code> and, since there is only a single
process, this is the total number of threads created at startup to
serve requests.</p>
-
- <p>For <module>beos</module> the default is <code>StartThreads
- 10</code>. It also reflects the total number of threads created
- at startup to serve requests.</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=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mpm.xml (original)
+++ httpd/httpd/trunk/docs/manual/mpm.xml Thu Mar 26 18:48:10 2009
@@ -101,7 +101,6 @@
<table>
<columnspec><column width=".2"/><column width=".2"/></columnspec>
-<tr><td>BeOS</td><td><module>beos</module></td></tr>
<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>
Modified: httpd/httpd/trunk/docs/manual/programs/configure.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/configure.xml?rev=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml Thu Mar 26 18:48:10 2009
@@ -662,7 +662,7 @@
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>mpmt_os2</module>,
+ <module>mpmt_os2</module>,
<module>prefork</module> and <module>worker</module>.</dd>
</dl>
</section>
Modified: httpd/httpd/trunk/server/mpm/MPM.NAMING
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/MPM.NAMING?rev=758796&r1=758795&r2=758796&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/MPM.NAMING (original)
+++ httpd/httpd/trunk/server/mpm/MPM.NAMING Thu Mar 26 18:48:10 2009
@@ -12,4 +12,3 @@
worker ........ Multi Process model with threads. One acceptor thread,
multiple worker threads.
netware ....... Multi-threaded MPM for Netware
- beos .......... Single Process Model with Threading on BeOS