SCOREBOARD_MAINTENANCE_INTERVAL is gone, except for some local

usage within the NetWare and OS/2 MPMs.

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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 2cd00e19ffc91a312d739c50c667b88ca768c922..bb512836c775db263a9406277469674e708aeb03 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -143,9 +143,8 @@ int ap_unregister_extra_mpm_process(pid_t pid);
 apr_status_t ap_mpm_safe_kill(pid_t pid, int sig);
 
 /**
- * Determine if any child process has died.  If no child process died, then
- * this process sleeps for the amount of time specified by the MPM defined
- * macro SCOREBOARD_MAINTENANCE_INTERVAL.
+ * Run the monitor hook (once every ten calls), determine if any child
+ * process has died and, if none died, sleep one second.
  * @param status The return code if a process has died
  * @param exitcode The returned exit status of the child, if a child process 
  *                 dies, or the signal that caused the child to die.

diff --git a/server/mpm/event/mpm_default.h b/server/mpm/event/mpm_default.h
index c0615b4689f84b65862dc3c1a8de43402b5d6640..d27b233c50fa5ed06021ba55cca090a8724459da 100644 (file)
--- a/server/mpm/event/mpm_default.h
+++ b/server/mpm/event/mpm_default.h
@@ -56,13 +56,6 @@
 #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
-/*
- * Interval, in microseconds, between scoreboard maintenance.
- */
-#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
-#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */

diff --git a/server/mpm/prefork/mpm_default.h b/server/mpm/prefork/mpm_default.h
index 3fe9182ce4852997ed46c6deaa0b2c899a131bf2..02e9320ed9081d871e5173e31fa5c3b8d6a8afef 100644 (file)
--- a/server/mpm/prefork/mpm_default.h
+++ b/server/mpm/prefork/mpm_default.h
@@ -51,13 +51,6 @@
 #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
-/*
- * Interval, in microseconds, between scoreboard maintenance.
- */
-#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
-#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */

diff --git a/server/mpm/winnt/mpm_default.h b/server/mpm/winnt/mpm_default.h
index 990eb47ae507e1ffb4c41a7770d9b84ee9b992e7..4defd2e6c7c0b264e5d1dee8b574003f6137f195 100644 (file)
--- a/server/mpm/winnt/mpm_default.h
+++ b/server/mpm/winnt/mpm_default.h
@@ -71,13 +71,6 @@
 #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
-/*
- * Interval, in microseconds, between scoreboard maintenance.
- */
-#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
-#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */

diff --git a/server/mpm/worker/mpm_default.h b/server/mpm/worker/mpm_default.h
index 1743721bee55dec99851f12e77e34277b032deba..c8ea98ac9e04666e62254a0c82d0e97c808cbb8e 100644 (file)
--- a/server/mpm/worker/mpm_default.h
+++ b/server/mpm/worker/mpm_default.h
@@ -55,13 +55,6 @@
 #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
 #endif
 
-/*
- * Interval, in microseconds, between scoreboard maintenance.
- */
-#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
-#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */