renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

perf evsel: Add a backpointer to the evlist a evsel is in

Browse Source 
So that functions that deal primarily with an evsel to access
information that concerns the whole evlist it is in.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1440677263-21954-5-git-send-email-kan.liang@intel.com
Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2015-08-27 08:07:40 -04:00
parent a598bb5e35
commit d49e469507
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/evlist.c
View File

@ -98,6 +98,7 @@ static void perf_evlist__purge(struct perf_evlist *evlist)
evlist__for_each_safe(evlist, n, pos) { evlist__for_each_safe(evlist, n, pos) {
list_del_init(&pos->node); list_del_init(&pos->node);
pos->evlist = NULL;
perf_evsel__delete(pos); perf_evsel__delete(pos);
} }
@ -125,6 +126,7 @@ void perf_evlist__delete(struct perf_evlist *evlist)
void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry) void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)
{ {
entry->evlist = evlist;
list_add_tail(&entry->node, &evlist->entries); list_add_tail(&entry->node, &evlist->entries);
entry->idx = evlist->nr_entries; entry->idx = evlist->nr_entries;
entry->tracking = !entry->idx; entry->tracking = !entry->idx;

2
tools/perf/util/evsel.c
View File

@ -206,6 +206,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
evsel->leader = evsel; evsel->leader = evsel;
evsel->unit = ""; evsel->unit = "";
evsel->scale = 1.0; evsel->scale = 1.0;
evsel->evlist = NULL;
INIT_LIST_HEAD(&evsel->node); INIT_LIST_HEAD(&evsel->node);
INIT_LIST_HEAD(&evsel->config_terms); INIT_LIST_HEAD(&evsel->config_terms);
perf_evsel__object.init(evsel); perf_evsel__object.init(evsel);
@ -1026,6 +1027,7 @@ void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
void perf_evsel__exit(struct perf_evsel *evsel) void perf_evsel__exit(struct perf_evsel *evsel)
{ {
assert(list_empty(&evsel->node)); assert(list_empty(&evsel->node));
assert(evsel->evlist == NULL);
perf_evsel__free_fd(evsel); perf_evsel__free_fd(evsel);
perf_evsel__free_id(evsel); perf_evsel__free_id(evsel);
perf_evsel__free_config_terms(evsel); perf_evsel__free_config_terms(evsel);

4
tools/perf/util/evsel.h
View File

@ -60,6 +60,9 @@ struct perf_evsel_config_term {
/** struct perf_evsel - event selector /** struct perf_evsel - event selector
* *
* @evlist - evlist this evsel is in, if it is in one.
* @node - To insert it into evlist->entries or in other list_heads, say in
* the event parsing routines.
* @name - Can be set to retain the original event name passed by the user, * @name - Can be set to retain the original event name passed by the user,
* so that when showing results in tools such as 'perf stat', we * so that when showing results in tools such as 'perf stat', we
* show the name used, not some alias. * show the name used, not some alias.
@ -73,6 +76,7 @@ struct perf_evsel_config_term {
*/ */
struct perf_evsel { struct perf_evsel {
struct list_head node; struct list_head node;
struct perf_evlist *evlist;
struct perf_event_attr attr; struct perf_event_attr attr;
char *filter; char *filter;
struct xyarray *fd; struct xyarray *fd;