gstein 01/09/20 02:03:25
Modified: server mpm_common.c
test testproc.c testsock.c
memory/unix apr_pools.c
Log:
Add an extra parameter to all apr_proc_wait() calls for the new "exitcode"
parameter. Pass NULL because we aren't interested in the value.
Revision Changes Path
1.68 +1 -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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mpm_common.c 2001/09/18 22:13:57 1.67
+++ mpm_common.c 2001/09/20 09:03:24 1.68
@@ -124,7 +124,7 @@
continue;
proc.pid = pid;
- waitret = apr_proc_wait(&proc, APR_NOWAIT);
+ waitret = apr_proc_wait(&proc, NULL, APR_NOWAIT);
if (waitret != APR_CHILD_NOTDONE) {
MPM_NOTE_CHILD_KILLED(i);
continue;
1.32 +2 -1 apr/test/testproc.c
Index: testproc.c
===================================================================
RCS file: /home/cvs/apr/test/testproc.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- testproc.c 2001/08/22 15:40:29 1.31
+++ testproc.c 2001/09/20 09:03:24 1.32
@@ -141,7 +141,8 @@
}
else printf( "Read failed.\n");
- TEST_NEQ("Waiting for child to die", apr_proc_wait(&newproc, APR_WAIT),
+ TEST_NEQ("Waiting for child to die",
+ apr_proc_wait(&newproc, NULL, APR_WAIT),
APR_CHILD_DONE, "OK", "Failed")
STD_TEST_NEQ("Removing directory", apr_dir_remove("proctest", pool))
1.23 +8 -8 apr/test/testsock.c
Index: testsock.c
===================================================================
RCS file: /home/cvs/apr/test/testsock.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- testsock.c 2001/06/08 04:49:49 1.22
+++ testsock.c 2001/09/20 09:03:24 1.23
@@ -96,18 +96,18 @@
exit(-1);
}
- while ((s1 = apr_proc_wait(&proc1, APR_NOWAIT)) == APR_CHILD_NOTDONE &&
- (s2 = apr_proc_wait(&proc2, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
+ while ((s1 = apr_proc_wait(&proc1, NULL, APR_NOWAIT)) ==
APR_CHILD_NOTDONE &&
+ (s2 = apr_proc_wait(&proc2, NULL, APR_NOWAIT)) ==
APR_CHILD_NOTDONE) {
continue;
}
if (s1 == APR_SUCCESS) {
apr_proc_kill(&proc2, SIGTERM);
- while (apr_proc_wait(&proc2, APR_WAIT) == APR_CHILD_NOTDONE);
+ while (apr_proc_wait(&proc2, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
}
else {
apr_proc_kill(&proc1, SIGTERM);
- while (apr_proc_wait(&proc1, APR_WAIT) == APR_CHILD_NOTDONE);
+ while (apr_proc_wait(&proc1, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
}
fprintf(stdout, "Network test completed.\n");
@@ -163,18 +163,18 @@
exit(-1);
}
- while ((s1 = apr_proc_wait(&proc1, APR_NOWAIT)) == APR_CHILD_NOTDONE &&
- (s2 = apr_proc_wait(&proc2, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
+ while ((s1 = apr_proc_wait(&proc1, NULL, APR_NOWAIT)) ==
APR_CHILD_NOTDONE &&
+ (s2 = apr_proc_wait(&proc2, NULL, APR_NOWAIT)) ==
APR_CHILD_NOTDONE) {
continue;
}
if (s1 == APR_SUCCESS) {
apr_proc_kill(&proc2, SIGTERM);
- while (apr_proc_wait(&proc2, APR_WAIT) == APR_CHILD_NOTDONE);
+ while (apr_proc_wait(&proc2, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
}
else {
apr_proc_kill(&proc1, SIGTERM);
- while (apr_proc_wait(&proc1, APR_WAIT) == APR_CHILD_NOTDONE);
+ while (apr_proc_wait(&proc1, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
}
fprintf(stdout, "Network test completed.\n");
1.112 +2 -2 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- apr_pools.c 2001/09/17 20:12:23 1.111
+++ apr_pools.c 2001/09/20 09:03:25 1.112
@@ -1422,7 +1422,7 @@
#ifndef NEED_WAITPID
/* Pick up all defunct processes */
for (p = procs; p; p = p->next) {
- if (apr_proc_wait(p->pid, APR_NOWAIT) != APR_CHILD_NOTDONE) {
+ if (apr_proc_wait(p->pid, NULL, APR_NOWAIT) != APR_CHILD_NOTDONE) {
p->kill_how = kill_never;
}
}
@@ -1467,7 +1467,7 @@
/* Now wait for all the signaled processes to die */
for (p = procs; p; p = p->next) {
if (p->kill_how != kill_never) {
- (void) apr_proc_wait(p->pid, APR_WAIT);
+ (void) apr_proc_wait(p->pid, NULL, APR_WAIT);
}
}
#ifdef WIN32
