adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf tools: Don't die in perf_header_attr__new()

Browse source 
We really should propagate such kinds of errors so that users of
these library functions decide what to do in such cases instead
of exiting in random places like now.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1258407027-384-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-16 19:30:26 -02:00 committed by Ingo Molnar
parent c34984b2bb
commit dc79c0fc08
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,8 @@ static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int n
h_attr = header->attr[nr]; h_attr = header->attr[nr];
} else { } else {
h_attr = perf_header_attr__new(a); h_attr = perf_header_attr__new(a);
perf_header__add_attr(header, h_attr); if (h_attr != NULL)
perf_header__add_attr(header, h_attr);
} }
return h_attr; return h_attr;
@ -308,6 +309,8 @@ try_again:
} }
h_attr = get_header_attr(attr, counter); h_attr = get_header_attr(attr, counter);
if (h_attr == NULL)
die("nomem\n");
if (!file_new) { if (!file_new) {
if (memcmp(&h_attr->attr, attr, sizeof(*attr))) { if (memcmp(&h_attr->attr, attr, sizeof(*attr))) {

22
tools/perf/util/header.c
View file

@ -19,16 +19,16 @@ struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr)
{ {
struct perf_header_attr *self = malloc(sizeof(*self)); struct perf_header_attr *self = malloc(sizeof(*self));
if (!self) if (self != NULL) {
die("nomem"); self->attr = *attr;
self->ids = 0;
self->attr = *attr; self->size = 1;
self->ids = 0; self->id = malloc(sizeof(u64));
self->size = 1; if (self->id == NULL) {
self->id = malloc(sizeof(u64)); free(self);
self = NULL;
if (!self->id) }
die("nomem"); }
return self; return self;
} }
@ -423,6 +423,8 @@ struct perf_header *perf_header__read(int fd)
tmp = lseek(fd, 0, SEEK_CUR); tmp = lseek(fd, 0, SEEK_CUR);
attr = perf_header_attr__new(&f_attr.attr); attr = perf_header_attr__new(&f_attr.attr);
if (attr == NULL)
die("nomem");
nr_ids = f_attr.ids.size / sizeof(u64); nr_ids = f_attr.ids.size / sizeof(u64);
lseek(fd, f_attr.ids.offset, SEEK_SET); lseek(fd, f_attr.ids.offset, SEEK_SET);

4
tools/perf/util/header.h
View file

@ -64,9 +64,7 @@ void perf_header__add_attr(struct perf_header *self,
void perf_header__push_event(u64 id, const char *name); void perf_header__push_event(u64 id, const char *name);
char *perf_header__find_event(u64 id); char *perf_header__find_event(u64 id);
struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr);
struct perf_header_attr *
perf_header_attr__new(struct perf_event_attr *attr);
void perf_header_attr__add_id(struct perf_header_attr *self, u64 id); void perf_header_attr__add_id(struct perf_header_attr *self, u64 id);
u64 perf_header__sample_type(struct perf_header *header); u64 perf_header__sample_type(struct perf_header *header);