manoj 99/11/30 16:45:08
Modified: src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_beos mpmt_beos.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c
src/modules/mpm/prefork prefork.c
src/modules/mpm/spmt_os2 spmt_os2.c
Log:
Get rid of ap_check_signals() in all but the prefork MPM, and #define it
away there. It's a TPF-specific piece that will likely go into a TPF
MPM.
Revision Changes Path
1.60 +0 -2 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -u -r1.59 -r1.60
--- dexter.c 1999/11/29 23:32:41 1.59
+++ dexter.c 1999/12/01 00:44:53 1.60
@@ -1182,8 +1182,6 @@
/* initialize the free_list */
free_length = 0;
- ap_check_signals();
-
for (i = 0; i < num_daemons; ++i) {
if (child_table[i].status == SERVER_DEAD) {
if (free_length < spawn_rate) {
1.13 +0 -2 apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
Index: mpmt_beos.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -u -r1.12 -r1.13
--- mpmt_beos.c 1999/11/29 23:32:50 1.12
+++ mpmt_beos.c 1999/12/01 00:44:55 1.13
@@ -948,8 +948,6 @@
/* initialize the free_list */
free_length = 0;
- ap_check_signals();
-
for (i = 0; i < ap_daemons_limit; ++i) {
if (child_table[i].status == SERVER_DEAD) {
if (free_length < spawn_rate) {
1.50 +0 -2 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -u -r1.49 -r1.50
--- mpmt_pthread.c 1999/11/29 23:32:53 1.49
+++ mpmt_pthread.c 1999/12/01 00:44:56 1.50
@@ -1152,8 +1152,6 @@
last_non_dead = -1;
total_non_dead = 0;
- ap_check_signals();
-
ap_sync_scoreboard_image();
for (i = 0; i < ap_daemons_limit; ++i) {
/* Initialization to satisfy the compiler. It doesn't know
1.57 +4 -0 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -u -r1.56 -r1.57
--- prefork.c 1999/11/30 03:52:46 1.56
+++ prefork.c 1999/12/01 00:45:00 1.57
@@ -216,6 +216,10 @@
#define chdir_for_gprof()
#endif
+/* XXX - I don't know if TPF will ever use this module or not, so leave
+ * the ap_check_signals calls in but disable them - manoj */
+#define ap_check_signals()
+
/* a clean exit from a child with proper cleanup */
static void clean_child_exit(int code) __attribute__ ((noreturn));
static void clean_child_exit(int code)
1.27 +0 -2 apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
Index: spmt_os2.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -u -r1.26 -r1.27
--- spmt_os2.c 1999/11/30 03:52:51 1.26
+++ spmt_os2.c 1999/12/01 00:45:02 1.27
@@ -378,8 +378,6 @@
if (child_num < 0)
return -1;
- ap_check_signals();
-
ss = &ap_scoreboard_image->servers[child_num];
old_status = ss->status;
ss->status = status;
