From 4ec6c6fe3b62593fdab4bd83259bffa7942d12d2 Mon Sep 17 00:00:00 2001 From: Joshua Slive Date: Fri, 14 Jun 2002 02:31:01 +0000 Subject: [PATCH] Remove some directive docs from mpm_netware and point them at mpm_common, plus update the mpm_common docs to deal with multiple meanings for the same directives. In the future, it would be a wise idea not to use the same directive name as another MPM unless the directive really does exactly the same thing in both MPMs. Problem pointed out by: Rich Bowen git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95663 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.en | 2 +- docs/manual/mod/mpm_common.html.en | 59 +++++++++++++++++++-------- docs/manual/mod/mpm_common.xml | 62 ++++++++++++++++++++--------- docs/manual/mod/mpm_netware.html.en | 33 +++------------ docs/manual/mod/mpm_netware.xml | 48 +++------------------- 5 files changed, 100 insertions(+), 104 deletions(-) diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 62bf339c2c..cb050980ea 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -5,4 +5,4 @@ consistent format, and there is a dictionary of the terms used in their descriptions available.

-

Apache HTTP Server Version 2.0

IndexHome \ No newline at end of file +

Apache HTTP Server Version 2.0

IndexHome \ No newline at end of file diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index 8f94f3adf9..3ca366d45b 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -2,8 +2,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -->mpm_common- Apache HTTP Server
[APACHE DOCUMENTATION]

Apache HTTP Server Version 2.0

Apache Module mpm_common

Description:A collection of directives that are implemented by -more than one multi-processing module (MPM)
Status:MPM

Directives

CoreDumpDirectory Directive

Description: Directory where Apache attempts to + -->mpm_common- Apache HTTP Server
[APACHE DOCUMENTATION]

Apache HTTP Server Version 2.0

Apache Module mpm_common

Description:A collection of directives that are implemented by +more than one multi-processing module (MPM)
Status:MPM

Directives

CoreDumpDirectory Directive

Description: Directory where Apache attempts to switch before dumping core
Syntax:CoreDumpDirectory directory
Default:See usage for the default setting
Context:server config
Status:MPM
Module:worker, perchild, prefork, mpm_winnt

This controls the directory to which Apache attempts to @@ -155,18 +155,26 @@ will handle during its life

MaxSpareThreads Directive
Description: Maximum number of idle threads
Syntax:MaxSpareThreads number
Default:MaxSpareThreads 10 (Perchild) or 500 (worker)
Context:server config
Status:MPM
Module:worker, perchild
+

MaxSpareThreads Directive

Description: Maximum number of idle threads
Syntax:MaxSpareThreads number
Context:server config
Status:MPM
Module:mpm_netware, perchild, worker

Maximum number of idle threads. Different MPMs deal with 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 + directive differently.

+ +

For perchild the default is + MaxSpareThreads 10. 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.

-

worker deals with idle threads on a - server-wide basis. If there are too many idle threads in the +

For worker the default is + MaxSpareThreads 500. This MPM 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.

+

For mpm_netware the default is + MaxSpareThreads 100. Since this MPM runs a + single-process, the spare thread count is also server-wide.

+

See also

MaxThreadsPerChild Directive

Description: Maximum number of threads per child process
Syntax:MaxThreadsPerChild number
Default:MaxThreadsPerChild 64
Context:server config
Status:MPM
Module:worker, perchild

Maximum number of threads per child. For MPMs with a variable number of threads per child, this directive sets the @@ -175,18 +183,27 @@ will handle during its life

MinSpareThreads Directive
Description: Minimum number of idle threads available to handle request -spikes
Syntax:MinSpareServers number
Default:MinSpareThreads 5 (Perchild) or 250 (worker)
Context:server config
Status:MPM
Module:worker, perchild
+spikes
Syntax:MinSpareServers number
Context:server config
Status:MPM
Module:mpm_netware, perchild, worker

Minimum number of idle threads to handle request spikes. Different MPMs deal with this directive - differently. perchild monitors the number of idle + differently.

+ +

perchild uses a default of + MinSpareThreads 5 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.

-

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.

+

worker uses a default of MinSpareThreads + 250 and 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.

+ +

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

+

See also

NumServers Directive

Description: Total number of children alive at the same time
Syntax:NumServers number
Default:NumServers 2
Context:server config
Status:MPM
Module:perchild

Number of children alive at the same time. MPMs that use this directive do not dynamically create new child processes so @@ -270,11 +287,21 @@ the child processesMinSpareThreads

  • MaxSpareThreads

    • StartThreads Directive

    Description: Nubmer of threads each child creates on startup
    Syntax:StartThreads number
    Default:StartThreads 5
    Context:server config
    Status:MPM
    Module:perchild
    -

    Number of threads each child creates on startup. As the +

    See also

    StartThreads Directive

    Description: Nubmer of threads created on startup
    Syntax:StartThreads number
    Context:server config
    Status:MPM
    Module:mpm_netware, perchild
    +

    Number of threads created on startup. As the number of threads is dynamically controlled depending on the load, there is usually little reason to adjust this parameter.

    + +

    For perchild the default is StartThreads + 5 and this directive tracks the number of threads per + process at startup.

    + +

    For mpm_netware the default is + StartThreads 50 and, since there is only a single + process, this is the total number of threads created at startup to + serve requests.

    +

    ThreadLimit Directive

    Description: Sets the upper limit on the configurable number of threads per child process
    Syntax:ThreadLimit number
    Default:ThreadLimit 64
    Context:server config
    Status:MPM
    Module:worker

    This directive sets the maximum configured value for ThreadsPerChild for the lifetime diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 87b8b35294..03076413fc 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -292,23 +292,31 @@ will handle during its life MaxSpareThreads Maximum number of idle threads MaxSpareThreads number -MaxSpareThreads 10 (Perchild) or 500 (worker) server config -workerperchild +mpm_netware +perchildworker

    Maximum number of idle threads. Different MPMs deal with 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 + directive differently.

    + +

    For perchild the default is + MaxSpareThreads 10. 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.

    -

    worker deals with idle threads on a - server-wide basis. If there are too many idle threads in the +

    For worker the default is + MaxSpareThreads 500. This MPM 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.

    +

    For mpm_netware the default is + MaxSpareThreads 100. Since this MPM runs a + single-process, the spare thread count is also server-wide.

    + MinSpareThreads StartServers @@ -338,23 +346,32 @@ will handle during its life Minimum number of idle threads available to handle request spikes MinSpareServers number -MinSpareThreads 5 (Perchild) or 250 (worker) server config -workerperchild +mpm_netware +perchildworker

    Minimum number of idle threads to handle request spikes. Different MPMs deal with this directive - differently. perchild monitors the number of idle + differently.

    + +

    perchild uses a default of + MinSpareThreads 5 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.

    -

    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.

    +

    worker uses a default of MinSpareThreads + 250 and 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.

    + +

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

    +     MaxSpareThreads StartServers @@ -496,17 +513,26 @@ the child processes StartThreads -Nubmer of threads each child creates on startup +Nubmer of threads created on startup StartThreads number -StartThreads 5 server config -perchild +mpm_netwareperchild -

    Number of threads each child creates on startup. As the +

    Number of threads created on startup. As the number of threads is dynamically controlled depending on the load, there is usually little reason to adjust this parameter.

    + +

    For perchild the default is StartThreads + 5 and this directive tracks the number of threads per + process at startup.

    + +

    For mpm_netware the default is + StartThreads 50 and, since there is only a single + process, this is the total number of threads created at startup to + serve requests.

    +     diff --git a/docs/manual/mod/mpm_netware.html.en b/docs/manual/mod/mpm_netware.html.en index d446960f31..ee29586f3f 100644 --- a/docs/manual/mod/mpm_netware.html.en +++ b/docs/manual/mod/mpm_netware.html.en @@ -2,10 +2,11 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -->mpm_netware- Apache HTTP Server
    [APACHE DOCUMENTATION]

    Apache HTTP Server Version 2.0

    Apache Module mpm_netware

    Description:Multi-Processing Module implementing an exclusively threaded web - server optimized for Novell NetWare
    Status:MPM
    Module Identifier:mpm_netware_module

    Summary

    -

    This Multi-Processing Module (MPM) implements an exclusively threaded web server - that has been optimized for Novell NetWare.

    + -->mpm_netware- Apache HTTP Server
    [APACHE DOCUMENTATION]

    Apache HTTP Server Version 2.0

    Apache Module mpm_netware

    Description:Multi-Processing Module implementing an exclusively threaded web + server optimized for Novell NetWare
    Status:MPM
    Module Identifier:mpm_netware_module

    Summary

    +

    This Multi-Processing Module (MPM) implements an exclusively + threaded web server that has been optimized for Novell + NetWare.

    The main thread is responsible for launching child worker threads which listen for connections and serve them when they @@ -36,31 +37,9 @@

    See also: Setting which addresses and ports Apache uses.

    -

    Directives

    MaxSpareThreads Directive

    Description:
    Syntax:MaxSpareThreads number
    Default:MaxSpareThreads 100
    Context:server config
    Status:MPM
    Module:mpm_netware
    -

    The MaxSpareThreads directive sets the - desired maximum number of idle worker threads. An idle - worker thread is one which is not handling a request. If there are - more than MaxSpareThreads idle, then the main thread will kill off - the excess worker threads.

    - -

    Tuning of this parameter should only be necessary on very - busy sites. Setting this parameter to a large number is almost - always a bad idea.

    -

    MaxThreads Directive

    Description:
    Syntax:MaxThreads number
    Default:MaxThreads 250
    Context:server config
    Status:MPM
    Module:mpm_netware
    +

    Directives

    MaxThreads Directive

    Description:
    Syntax:MaxThreads number
    Default:MaxThreads 250
    Context:server config
    Status:MPM
    Module:mpm_netware

    The MaxThreads directive sets the desired maximum number worker threads allowable.

    -

    MinSpareThreads Directive

    Description:
    Syntax:MinSpareThreads number
    Default:MinSpareThreads 10
    Context:server config
    Status:MPM
    Module:mpm_netware
    -

    The MinSpareThreads directive sets the -desired minimum number of idle worker threads. An idle worker -thread is one which is not handling a request. If there are fewer than -MinSpareThreads idle, then the main thread spawns new worker.

    - -

    Tuning of this parameter should only be necessary on very - busy sites. Setting this parameter to a large number is almost - always a bad idea.

    -

    StartThreads Directive

    Description:
    Syntax:StartThreads number
    Default:StartThreads 50
    Context:server config
    Status:MPM
    Module:mpm_netware
    -

    The StartThreads directive sets the desired - number of worker threads to spawn and startup

    ThreadStackSize Directive

    Description:
    Syntax:ThreadStackSize number
    Default:ThreadStackSize 65536
    Context:server config
    Status:MPM
    Module:mpm_netware

    This directive tells the server what stack size to use for each of the running threads. If you ever get a stack overflow diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml index 88f9bc5643..533b5ed84e 100644 --- a/docs/manual/mod/mpm_netware.xml +++ b/docs/manual/mod/mpm_netware.xml @@ -10,8 +10,9 @@ mpm_netware_module

    -

    This Multi-Processing Module (MPM) implements an exclusively threaded web server - that has been optimized for Novell NetWare.

    +

    This Multi-Processing Module (MPM) implements an exclusively + threaded web server that has been optimized for Novell + NetWare.

    The main thread is responsible for launching child worker threads which listen for connections and serve them when they @@ -66,53 +67,16 @@ - + MaxSpareThreads -MaxSpareThreads number -MaxSpareThreads 100 -server config - - -

    The MaxSpareThreads directive sets the - desired maximum number of idle worker threads. An idle - worker thread is one which is not handling a request. If there are - more than MaxSpareThreads idle, then the main thread will kill off - the excess worker threads.

    - -

    Tuning of this parameter should only be necessary on very - busy sites. Setting this parameter to a large number is almost - always a bad idea.

    - - + MinSpareThreads -MinSpareThreads number -MinSpareThreads 10 -server config - - -

    The MinSpareThreads directive sets the -desired minimum number of idle worker threads. An idle worker -thread is one which is not handling a request. If there are fewer than -MinSpareThreads idle, then the main thread spawns new worker.

    - -

    Tuning of this parameter should only be necessary on very - busy sites. Setting this parameter to a large number is almost - always a bad idea.

    -         - + StartThreads -StartThreads number -StartThreads 50 -server config - - -

    The StartThreads directive sets the desired - number of worker threads to spawn and startup

    -         -- 2.50.1