perf fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (2):
perf symbols: Fix kallsyms kernel/module map splitting perf record: Fix eternal wait for stillborn child
Franck Bui-Huu (1):
perf header: Don't assume there's no attr info if no sample ids is provided
Ming Lei (1):
perf symbols: Figure out start address of kernel map from kallsyms
tools/perf/builtin-record.c | 6 +++- tools/perf/util/header.c | 11 ++++++-- tools/perf/util/symbol.c | 59 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 65 insertions(+), 11 deletions(-)
tools/perf/builtin-record.c +4 -2
@@ -197,7 +197,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 );
@@ -515,6 +515,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" );
@@ -606,6 +607,7 @@ static int __cmd_record(int argc, const char **argv)execvp (argv[0 ], (char **)argv);perror (argv[0 ]); +kill (getppid (),SIGUSR1 );exit (-1 ); }
@@ -762,7 +764,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);
tools/perf/util/header.c +8 -3
@@ -946,11 +946,16 @@ perf_header__find_attr(u64 id, struct perf_header *header)/* * We set id to -1 if the data file doesn't contain sample -* ids. Check for this and avoid walking through the entire -* list of ids which may be large. +* ids. This can happen when the data file contains one type +* of event and in that case, the header can still store the +* event attribute information. Check for this and avoid +* walking through the entire list of ids which may be large. */ -if (id ==-1ULL ) +if (id ==-1ULL ) { +if (header->attrs >0 ) +return &header->attr[0 ]->attr;return NULL ; + }for (i =0 ; i < header->attrs; i++) {struct perf_header_attr *attr = header->attr[i];
tools/perf/util/symbol.c +53 -6
102 lines not on this page · raw message