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-record.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-record.c')
-rw-r--r-- | tools/perf/builtin-record.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index a5a050af8e7d..3eeef339c787 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -41,6 +41,7 @@ static int raw_samples = 0; | |||
41 | static int system_wide = 0; | 41 | static int system_wide = 0; |
42 | static int profile_cpu = -1; | 42 | static int profile_cpu = -1; |
43 | static pid_t target_pid = -1; | 43 | static pid_t target_pid = -1; |
44 | static pid_t child_pid = -1; | ||
44 | static int inherit = 1; | 45 | static int inherit = 1; |
45 | static int force = 0; | 46 | static int force = 0; |
46 | static int append_file = 0; | 47 | static int append_file = 0; |
@@ -184,6 +185,9 @@ static void sig_handler(int sig) | |||
184 | 185 | ||
185 | static void sig_atexit(void) | 186 | static void sig_atexit(void) |
186 | { | 187 | { |
188 | if (child_pid != -1) | ||
189 | kill(child_pid, SIGTERM); | ||
190 | |||
187 | if (signr == -1) | 191 | if (signr == -1) |
188 | return; | 192 | return; |
189 | 193 | ||
@@ -610,6 +614,8 @@ static int __cmd_record(int argc, const char **argv) | |||
610 | exit(-1); | 614 | exit(-1); |
611 | } | 615 | } |
612 | } | 616 | } |
617 | |||
618 | child_pid = pid; | ||
613 | } | 619 | } |
614 | 620 | ||
615 | if (realtime_prio) { | 621 | if (realtime_prio) { |