diff options
| author | rsc <devnull@localhost> | 2004-10-22 17:12:38 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-10-22 17:12:38 +0000 |
| commit | 32116738e10e88f4d8eb136652fa945c6415d462 (patch) | |
| tree | 74eb2288a0849f4a933aa0a80408f7e475011dce /src/lib9/rfork.c | |
| parent | aa200fe309dbb3292a218bcdf93615738963109a (diff) | |
| download | plan9port-32116738e10e88f4d8eb136652fa945c6415d462.tar.gz plan9port-32116738e10e88f4d8eb136652fa945c6415d462.tar.bz2 plan9port-32116738e10e88f4d8eb136652fa945c6415d462.zip | |
more debugging
Diffstat (limited to 'src/lib9/rfork.c')
| -rw-r--r-- | src/lib9/rfork.c | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/src/lib9/rfork.c b/src/lib9/rfork.c index aec051a9..9865a5ae 100644 --- a/src/lib9/rfork.c +++ b/src/lib9/rfork.c @@ -4,6 +4,12 @@ #include <libc.h> #undef rfork +static void +nop(int x) +{ + USED(x); +} + int p9rfork(int flags) { @@ -21,6 +27,13 @@ p9rfork(int flags) return -1; } if(flags&RFNOWAIT){ + /* + * BUG - should put the signal handler back after we + * finish, but I just don't care. If a program calls with + * NOWAIT once, they're not likely to want child notes + * after that. + */ + signal(SIGCHLD, nop); if(pipe(p) < 0) return -1; } @@ -35,20 +48,33 @@ p9rfork(int flags) * Then read pid from pipe. Assume pipe buffer can absorb the write. */ close(p[1]); - wait4(pid, &status, 0, 0); + status = 0; + if(wait4(pid, &status, 0, 0) < 0){ + werrstr("pipe dance - wait4 - %r"); + close(p[0]); + return -1; + } n = readn(p[0], buf, sizeof buf-1); close(p[0]); if(!WIFEXITED(status) || WEXITSTATUS(status)!=0 || n <= 0){ - werrstr("pipe dance failed in rfork"); + if(!WIFEXITED(status)) + werrstr("pipe dance - !exited 0x%ux", status); + else if(WEXITSTATUS(status) != 0) + werrstr("pipe dance - non-zero status 0x%ux", status); + else if(n < 0) + werrstr("pipe dance - pipe read error - %r"); + else if(n == 0) + werrstr("pipe dance - pipe read eof"); + else + werrstr("pipe dance - unknown failure"); return -1; } buf[n] = 0; - n = strtol(buf, &q, 0); - if(*q != 0){ - werrstr("%s", q); + if(buf[0] == 'x'){ + werrstr("%s", buf+2); return -1; } - pid = n; + pid = strtol(buf, &q, 0); }else{ /* * Child - fork a new child whose wait message can't @@ -62,7 +88,7 @@ p9rfork(int flags) if(pid > 0) fprint(p[1], "%d", pid); else - fprint(p[1], " %r"); + fprint(p[1], "x %r"); close(p[1]); _exit(0); }else{ |