You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by re...@apache.org on 2002/03/29 17:15:33 UTC
cvs commit: httpd-2.0/server/mpm/worker mpm.h
rederpj 02/03/29 08:15:33
Modified: server mpm_common.c
server/mpm/beos mpm.h
server/mpm/netware mpm.h
server/mpm/perchild mpm.h
server/mpm/prefork mpm.h
server/mpm/worker mpm.h
Log:
Submitted by: Paul J. Reder
Remove the MPM_SYNC_CHILD_TABLE macro since there is no longer a scoreboard
file that needs to be synched.
Revision Changes Path
1.91 +0 -1 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mpm_common.c 20 Mar 2002 22:19:11 -0000 1.90
+++ mpm_common.c 29 Mar 2002 16:15:32 -0000 1.91
@@ -107,7 +107,6 @@
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
1.13 +0 -1 httpd-2.0/server/mpm/beos/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/mpm.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mpm.h 13 Mar 2002 20:48:02 -0000 1.12
+++ mpm.h 29 Mar 2002 16:15:33 -0000 1.13
@@ -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)
1.5 +0 -1 httpd-2.0/server/mpm/netware/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpm.h 13 Mar 2002 20:48:03 -0000 1.4
+++ mpm.h 29 Mar 2002 16:15:33 -0000 1.5
@@ -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)
1.14 +0 -1 httpd-2.0/server/mpm/perchild/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/mpm.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mpm.h 13 Mar 2002 20:48:03 -0000 1.13
+++ mpm.h 29 Mar 2002 16:15:33 -0000 1.14
@@ -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)
1.19 +0 -1 httpd-2.0/server/mpm/prefork/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/mpm.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mpm.h 13 Mar 2002 20:48:04 -0000 1.18
+++ mpm.h 29 Mar 2002 16:15:33 -0000 1.19
@@ -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
1.12 +0 -1 httpd-2.0/server/mpm/worker/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/worker/mpm.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mpm.h 13 Mar 2002 20:48:05 -0000 1.11
+++ mpm.h 29 Mar 2002 16:15:33 -0000 1.12
@@ -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