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 8054b49b595b5d43c4edc0ce85362531026620a3..37f1b22055cda7a2d75a2e6c5a766731c7c8fe17 100644 (file)
--- 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 bc4c264f3403cfee6e7ac49f2fac5ced72863691..b7175e5a81795b7b2d7108e1e33c3aa18dfdca07 100644 (file)
--- 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 44fdd691b0630537b7177c731dfac47d6e34961f..74a5f55194bf44f4fa7af782daaf9adb791d16d8 100644 (file)
--- 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 bc4c264f3403cfee6e7ac49f2fac5ced72863691..b7175e5a81795b7b2d7108e1e33c3aa18dfdca07 100644 (file)
--- 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 c7672b81d2d96dbf8b1d0b585c4863ce5e5746eb..514c2b02f40396010d21f270793abd6cd9dd9c8b 100644 (file)
--- 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 baa63c49a974d45611d112bde92e77db1564439a..896fb82b962247b172794d5739ae2d1d89a43ce3 100644 (file)
--- 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 f728464ea005c64eeac1e7132ed8dd4c5fab0d4e..4023dd043c1ccabe17a232b1724cbd2081fa3b72 100644 (file)
--- 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