You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/05/08 17:36:24 UTC
cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c
rbb 00/05/08 08:36:24
Modified: src/modules/mpm/dexter dexter.c
Log:
reap_children doesn't make sense on a machine without a scoreboard, and it
causes compile problems, so it's going away on dexter now.
Revision Changes Path
1.75 +2 -7 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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dexter.c 2000/05/04 19:42:55 1.74
+++ dexter.c 2000/05/08 15:36:19 1.75
@@ -275,7 +275,7 @@
#endif
static int wait_or_timeout_counter;
-static ap_proc_t *wait_or_timeout(ap_wait_t *status, ap_pool_t *p)
+static ap_proc_t *wait_or_timeout(ap_pool_t *p)
{
struct timeval tv;
ap_status_t rv;
@@ -295,11 +295,6 @@
if (rv == APR_CHILD_DONE) {
return ret;
}
-#ifdef NEED_WAITPID
- if ((ret = reap_children(status)) > 0) {
- return ret;
- }
-#endif
tv.tv_sec = SCOREBOARD_MAINTENANCE_INTERVAL / 1000000;
tv.tv_usec = SCOREBOARD_MAINTENANCE_INTERVAL % 1000000;
ap_select(0, NULL, NULL, NULL, &tv);
@@ -1089,7 +1084,7 @@
int i;
while (!restart_pending && !shutdown_pending) {
- pid = wait_or_timeout(&status, pconf);
+ pid = wait_or_timeout(pconf);
if (pid != NULL) {
int actual_pid;