lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
Merge reason: We want to apply a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-12-16 11:22:25 +01:00
parent 5f29805a4f d949750fed
commit 006b20fe4c
63 changed files with 906 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ static void sig_atexit(void)
if (child_pid > 0)
kill(child_pid, SIGTERM);
if (signr == -1)
if (signr == -1 || signr == SIGUSR1)
return;
signal(signr, SIG_DFL);
@ -535,6 +535,7 @@ static int __cmd_record(int argc, const char **argv)
atexit(sig_atexit);
signal(SIGCHLD, sig_handler);
signal(SIGINT, sig_handler);
signal(SIGUSR1, sig_handler);
if (forks && (pipe(child_ready_pipe) < 0 || pipe(go_pipe) < 0)) {
perror("failed to create pipes");
@ -629,6 +630,7 @@ static int __cmd_record(int argc, const char **argv)
execvp(argv[0], (char **)argv);
perror(argv[0]);
kill(getppid(), SIGUSR1);
exit(-1);
}
@ -789,7 +791,7 @@ static int __cmd_record(int argc, const char **argv)
}
}
if (quiet)
if (quiet || signr == SIGUSR1)
return 0;
fprintf(stderr, "[ perf record: Woken up %ld times to write data ]\n", waking);