diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2020-06-02 12:24:10 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2020-06-02 12:24:10 +0000 |
| commit | daefbac48126bec16b77b33f6f5ef03d41506c96 (patch) | |
| tree | 6122e7ff339d4ba953a7f2b8eb03d21422de7f9b /usr.bin/make | |
| parent | 8554cfbb35f8e278fb831eaa869232c2ead8b687 (diff) | |
use the right abstraction to abort jobs, also show debug info as this
thing is tricky
okay millert@
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/job.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 329ff3037c2..c3ac2d6b28b 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.160 2020/01/29 17:06:51 espie Exp $ */ +/* $OpenBSD: job.c,v 1.161 2020/06/02 12:24:09 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* @@ -946,8 +946,12 @@ Job_AbortAll(void) aborting = ABORT_ERROR; for (job = runningJobs; job != NULL; job = job->next) { - killpg(job->pid, SIGINT); - killpg(job->pid, SIGKILL); + debug_kill_printf("abort: send SIGINT to " + "child %ld running %s: %s\n", + (long)job->pid, job->node->name, really_kill(job, SIGINT)); + debug_kill_printf("abort: send SIGKILL to " + "child %ld running %s: %s\n", + (long)job->pid, job->node->name, really_kill(job, SIGKILL)); } /* |