summaryrefslogtreecommitdiff
path: root/test/testsock.c
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-05-23 21:03:59 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-05-23 21:03:59 +0000
commit561065c4767d52fbfbeb0e53daabaec424881744 (patch)
treee871e286effb0f9bb2cd7b0d9e5ae91f00ded894 /test/testsock.c
parent1ab7955125a0d6b3314b9ecfc36c618b9cd4d4fc (diff)
downloadlibapr-561065c4767d52fbfbeb0e53daabaec424881744.tar.gz
Convert ap_proc_t to a complete type. This lets us access the pid directly.
Only the prefork MPM has been ported so far, the rest of the Unix MPM's are coming later today. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60087 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testsock.c')
-rw-r--r--test/testsock.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/testsock.c b/test/testsock.c
index 98f164480..a0b8350e0 100644
--- a/test/testsock.c
+++ b/test/testsock.c
@@ -68,8 +68,8 @@ int main(int argc, char *argv[])
ap_procattr_t *attr1 = NULL;
ap_procattr_t *attr2 = NULL;
- ap_proc_t *proc1 = NULL;
- ap_proc_t *proc2 = NULL;
+ ap_proc_t proc1;
+ ap_proc_t proc2;
ap_status_t s1;
ap_status_t s2;
char *args[2];
@@ -115,18 +115,18 @@ int main(int argc, char *argv[])
exit(-1);
}
- while ((s1 = ap_wait_proc(proc1, APR_NOWAIT)) != APR_CHILD_DONE ||
- (s2 = ap_wait_proc(proc2, APR_NOWAIT)) != APR_CHILD_DONE) {
+ while ((s1 = ap_wait_proc(&proc1, APR_NOWAIT)) != APR_CHILD_DONE ||
+ (s2 = ap_wait_proc(&proc2, APR_NOWAIT)) != APR_CHILD_DONE) {
continue;
}
if (s1 == APR_SUCCESS) {
- ap_kill(proc2, SIGTERM);
- ap_wait_proc(proc2, APR_WAIT);
+ ap_kill(&proc2, SIGTERM);
+ ap_wait_proc(&proc2, APR_WAIT);
}
else {
- ap_kill(proc1, SIGTERM);
- ap_wait_proc(proc1, APR_WAIT);
+ ap_kill(&proc1, SIGTERM);
+ ap_wait_proc(&proc1, APR_WAIT);
}
fprintf(stdout, "Network test completed.\n");