From: Jeff Trawick <trawick@apache.org>
Date: Sat, 26 Mar 2011 18:37:14 +0000 (+0000)
Subject: SCOREBOARD_MAINTENANCE_INTERVAL is gone, except for some local
X-Git-Tag: 2.3.12~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc2cf0624acecde8e881758a7d481d9b357030e8;p=thirdparty%2Fapache%2Fhttpd.git

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 2cd00e19ffc..bb512836c77 100644
--- 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 c0615b4689f..d27b233c50f 100644
--- 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 3fe9182ce48..02e9320ed90 100644
--- 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 990eb47ae50..4defd2e6c7c 100644
--- 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 1743721bee5..c8ea98ac9e0 100644
--- 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.
  */