From: Manoj Kasichainula <manoj@apache.org>
Date: Wed, 1 Dec 1999 00:45:02 +0000 (+0000)
Subject: Get rid of ap_check_signals() in all but the prefork MPM, and #define it
X-Git-Tag: 1.3.10~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1582947dd510401a8a4ba47ed5e2caa03674b2a6;p=apache

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.


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

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index c7146de8f3..3fa148e2fa 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1182,8 +1182,6 @@ static void perform_child_maintenance(void)
     /* 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) {
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index a26db6a4cc..a8f0daeca9 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -948,8 +948,6 @@ static void perform_idle_server_maintenance(void)
     /* 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) {
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index c2f2446546..f648589ec2 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1152,8 +1152,6 @@ static void perform_idle_server_maintenance(void)
     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
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 39e1efe5be..bf000726da 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -216,6 +216,10 @@ static void chdir_for_gprof(void)
 #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)
diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 09d305b386..907c5a76b4 100644
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -378,8 +378,6 @@ int ap_update_child_status(int child_num, int status, request_rec *r)
     if (child_num < 0)
 	return -1;
 
-    ap_check_signals();
-
     ss = &ap_scoreboard_image->servers[child_num];
     old_status = ss->status;
     ss->status = status;