diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-10-03 20:35:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-04 13:37:39 -0400 |
commit | 933da83aa17939a78d59708321c0b27d0ec8c6ce (patch) | |
tree | 623ef9032ef6321179a389147a3296f064037504 /tools/perf/builtin-stat.c | |
parent | 1ad0560e8cdb6d5b381220dc2da187691b5ce124 (diff) |
perf: Propagate term signal to child
If we launch the child on behalf of the user, ensure that it dies
along with ourselves when we are interrupted.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
LKML-Reference: <1254616502-4728-1-git-send-email-chris@chris-wilson.co.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-stat.c')
-rw-r--r-- | tools/perf/builtin-stat.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index e5f6ece65a13..3db31e7bf173 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
@@ -69,7 +69,8 @@ static int run_idx = 0; | |||
69 | static int run_count = 1; | 69 | static int run_count = 1; |
70 | static int inherit = 1; | 70 | static int inherit = 1; |
71 | static int scale = 1; | 71 | static int scale = 1; |
72 | static int target_pid = -1; | 72 | static pid_t target_pid = -1; |
73 | static pid_t child_pid = -1; | ||
73 | static int null_run = 0; | 74 | static int null_run = 0; |
74 | 75 | ||
75 | static int fd[MAX_NR_CPUS][MAX_COUNTERS]; | 76 | static int fd[MAX_NR_CPUS][MAX_COUNTERS]; |
@@ -285,6 +286,8 @@ static int run_perf_stat(int argc __used, const char **argv) | |||
285 | exit(-1); | 286 | exit(-1); |
286 | } | 287 | } |
287 | 288 | ||
289 | child_pid = pid; | ||
290 | |||
288 | /* | 291 | /* |
289 | * Wait for the child to be ready to exec. | 292 | * Wait for the child to be ready to exec. |
290 | */ | 293 | */ |
@@ -433,6 +436,9 @@ static void skip_signal(int signo) | |||
433 | 436 | ||
434 | static void sig_atexit(void) | 437 | static void sig_atexit(void) |
435 | { | 438 | { |
439 | if (child_pid != -1) | ||
440 | kill(child_pid, SIGTERM); | ||
441 | |||
436 | if (signr == -1) | 442 | if (signr == -1) |
437 | return; | 443 | return; |
438 | 444 | ||