Messages in this thread Patch in this message | | | Date | Tue, 7 Jun 2011 18:19:36 +0200 | From | Stephane Eranian <> | Subject | [PATCH] perf: fix missing event name init for default event (v2) |
| |
When no event is given to perf record, perf top, a default event is initialized (cycles). However, perf_evlist__add_default() was not setting the symbolic name for the event. Perf top worked simply because it was reconstructing the name from the event code. But it should not have to do this. This patch initializes the evsel->name field properly.
This second version improves the code flow on the non error path.
Signed-off-by: Stephane Eranian <eranian@google.com> ---
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index b021ea9..9a98c28 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -85,10 +85,19 @@ int perf_evlist__add_default(struct perf_evlist *evlist) struct perf_evsel *evsel = perf_evsel__new(&attr, 0); if (evsel == NULL) - return -ENOMEM; + goto error; + + /* use strdup() because free(evsel) assumes name is allocated */ + evsel->name = strdup("cycles"); + if (!evsel->name) + goto error_free; perf_evlist__add(evlist, evsel); return 0; +error_free: + free(evsel); +error: + return -ENOMEM; } int perf_evlist__alloc_pollfd(struct perf_evlist *evlist)
| |