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

perf tools: perf_header__read() shouldn't die()

Browse Source 
And also don't call the constructor in it, this way it adheres
to the model the other methods follow.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258649757-17554-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo
2009-11-19 14:55:55 -02:00
committed by Ingo Molnar
parent 2446042c93
commit 4dc0a04bb1
5 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,7 +400,7 @@ static int __cmd_record(int argc, const char **argv)
struct stat st;
pid_t pid = 0;
int flags;
int ret;
int err;
unsigned long waking = 0;
page_size = sysconf(_SC_PAGE_SIZE);
@@ -434,16 +434,18 @@ static int __cmd_record(int argc, const char **argv)
exit(-1);
}
if (!file_new)
header = perf_header__read(output);
else
header = perf_header__new();
header = perf_header__new();
if (header == NULL) {
pr_err("Not enough memory for reading perf file header\n");
return -1;
}
if (!file_new) {
err = perf_header__read(header, output);
if (err < 0)
return err;
}
if (raw_samples) {
perf_header__set_feat(header, HEADER_TRACE_INFO);
} else {
@@ -527,7 +529,7 @@ static int __cmd_record(int argc, const char **argv)
if (hits == samples) {
if (done)
break;
ret = poll(event_array, nr_poll, -1);
err = poll(event_array, nr_poll, -1);
waking++;
}