Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf: Propagate term signal to child

Browse source 
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>
This commit is contained in:
Chris Wilson 2009-10-04 01:35:01 +01:00 committed by Ingo Molnar
parent 1ad0560e8c
commit 933da83aa1
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/perf/builtin-record.c
View file

@ -41,6 +41,7 @@ static int raw_samples = 0;
static int system_wide = 0; static int system_wide = 0;
static int profile_cpu = -1; static int profile_cpu = -1;
static pid_t target_pid = -1; static pid_t target_pid = -1;
static pid_t child_pid = -1;
static int inherit = 1; static int inherit = 1;
static int force = 0; static int force = 0;
static int append_file = 0; static int append_file = 0;
@ -184,6 +185,9 @@ static void sig_handler(int sig)
static void sig_atexit(void) static void sig_atexit(void)
{ {
if (child_pid != -1)
kill(child_pid, SIGTERM);
if (signr == -1) if (signr == -1)
return; return;
@ -610,6 +614,8 @@ static int __cmd_record(int argc, const char **argv)
exit(-1); exit(-1);
} }
} }
child_pid = pid;
} }
if (realtime_prio) { if (realtime_prio) {

8
tools/perf/builtin-stat.c
View file

@ -69,7 +69,8 @@ static int run_idx = 0;
static int run_count = 1; static int run_count = 1;
static int inherit = 1; static int inherit = 1;
static int scale = 1; static int scale = 1;
static int target_pid = -1; static pid_t target_pid = -1;
static pid_t child_pid = -1;
static int null_run = 0; static int null_run = 0;
static int fd[MAX_NR_CPUS][MAX_COUNTERS]; static int fd[MAX_NR_CPUS][MAX_COUNTERS];
@ -285,6 +286,8 @@ static int run_perf_stat(int argc __used, const char **argv)
exit(-1); exit(-1);
} }
child_pid = pid;
/* /*
* Wait for the child to be ready to exec. * Wait for the child to be ready to exec.
*/ */
@ -433,6 +436,9 @@ static void skip_signal(int signo)
static void sig_atexit(void) static void sig_atexit(void)
{ {
if (child_pid != -1)
kill(child_pid, SIGTERM);
if (signr == -1) if (signr == -1)
return; return;