Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae99fb2c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf header: perf_header__push_event() shouldn't die 



Just propagate eventual errors.

Signed-off-by: default avatarArnaldo 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: <1262047716-23171-2-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 769885f3

tools/perf/util/header.c

+10 −6
Original line number Diff line number Diff line
@@ -105,24 +105,28 @@ struct perf_trace_event_type { 
static int event_count;

static struct perf_trace_event_type *events;



void perf_header__push_event(u64 id, const char *name)

int perf_header__push_event(u64 id, const char *name)

{

	if (strlen(name) > MAX_EVENT_NAME)

		pr_warning("Event %s will be truncated\n", name);



	if (!events) {

		events = malloc(sizeof(struct perf_trace_event_type));

		if (!events)

			die("nomem");

		if (events == NULL)

			return -ENOMEM;

	} else {

		events = realloc(events, (event_count + 1) * sizeof(struct perf_trace_event_type));

		if (!events)

			die("nomem");

		struct perf_trace_event_type *nevents;



		nevents = realloc(events, (event_count + 1) * sizeof(*events));

		if (nevents == NULL)

			return -ENOMEM;

		events = nevents;

	}

	memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));

	events[event_count].event_id = id;

	strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);

	event_count++;

	return 0;

}



char *perf_header__find_event(u64 id)

tools/perf/util/header.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit); 
int perf_header__add_attr(struct perf_header *self,

			  struct perf_header_attr *attr);



void perf_header__push_event(u64 id, const char *name);

int perf_header__push_event(u64 id, const char *name);

char *perf_header__find_event(u64 id);



struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr);

tools/perf/util/parse-events.c

+11 −7
Original line number Diff line number Diff line
@@ -753,11 +753,11 @@ parse_event_symbols(const char **str, struct perf_event_attr *attr) 
	return ret;

}



static void store_event_type(const char *orgname)

static int store_event_type(const char *orgname)

{

	char filename[PATH_MAX], *c;

	FILE *file;

	int id;

	int id, n;



	sprintf(filename, "%s/", debugfs_path);

	strncat(filename, orgname, strlen(orgname));
@@ -769,11 +769,14 @@ static void store_event_type(const char *orgname) 


	file = fopen(filename, "r");

	if (!file)

		return;

	if (fscanf(file, "%i", &id) < 1)

		die("cannot store event ID");

		return 0;

	n = fscanf(file, "%i", &id);

	fclose(file);

	perf_header__push_event(id, orgname);

	if (n < 1) {

		pr_err("cannot store event ID\n");

		return -EINVAL;

	}

	return perf_header__push_event(id, orgname);

}



int parse_events(const struct option *opt __used, const char *str, int unset __used)
@@ -782,7 +785,8 @@ int parse_events(const struct option *opt __used, const char *str, int unset __u 
	enum event_result ret;



	if (strchr(str, ':'))

		store_event_type(str);

		if (store_event_type(str) < 0)

			return -1;



	for (;;) {

		if (nr_counters == MAX_COUNTERS)