From: Paul J. Reder <rederpj@apache.org>
Date: Fri, 29 Mar 2002 16:15:33 +0000 (+0000)
Subject: PR:
X-Git-Tag: 2.0.34~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78ae2a9eb4033c4cbee50f4f0a1533c434af34d0;p=apache

PR:
Obtained from:
Submitted by:	Paul J. Reder
Reviewed by:

Remove the MPM_SYNC_CHILD_TABLE macro since there is no longer a scoreboard
file that needs to be synched.


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

diff --git a/server/mpm/beos/mpm.h b/server/mpm/beos/mpm.h
index 8054b49b59..37f1b22055 100644
--- a/server/mpm/beos/mpm.h
+++ b/server/mpm/beos/mpm.h
@@ -63,7 +63,6 @@
 #include "scoreboard.h"
 
 #define MPM_NAME "Beos"
-#define MPM_SYNC_CHILD_TABLE()
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h
index bc4c264f34..b7175e5a81 100644
--- a/server/mpm/experimental/perchild/mpm.h
+++ b/server/mpm/experimental/perchild/mpm.h
@@ -77,7 +77,6 @@
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
 
-#define MPM_SYNC_CHILD_TABLE()
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
diff --git a/server/mpm/netware/mpm.h b/server/mpm/netware/mpm.h
index 44fdd691b0..74a5f55194 100644
--- a/server/mpm/netware/mpm.h
+++ b/server/mpm/netware/mpm.h
@@ -77,7 +77,6 @@
   #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH 
 */
 
-#define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
diff --git a/server/mpm/perchild/mpm.h b/server/mpm/perchild/mpm.h
index bc4c264f34..b7175e5a81 100644
--- a/server/mpm/perchild/mpm.h
+++ b/server/mpm/perchild/mpm.h
@@ -77,7 +77,6 @@
 #define AP_MPM_WANT_SET_COREDUMPDIR
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
 
-#define MPM_SYNC_CHILD_TABLE()
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index c7672b81d2..514c2b02f4 100644
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -80,7 +80,6 @@
 #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
 #define AP_MPM_USES_POD 1
-#define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 #define MPM_ACCEPT_FUNC unixd_accept
diff --git a/server/mpm/worker/mpm.h b/server/mpm/worker/mpm.h
index baa63c49a9..896fb82b96 100644
--- a/server/mpm/worker/mpm.h
+++ b/server/mpm/worker/mpm.h
@@ -76,7 +76,6 @@
 #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH
 #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
-#define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())
 #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 #define MPM_ACCEPT_FUNC unixd_accept
diff --git a/server/mpm_common.c b/server/mpm_common.c
index f728464ea0..4023dd043c 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -107,7 +107,6 @@ void ap_reclaim_child_processes(int terminate)
     int max_daemons;
 
     ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
-    MPM_SYNC_CHILD_TABLE();
 
     for (tries = terminate ? 4 : 1; tries <= 9; ++tries) {
         /* don't want to hold up progress any more than