Re: [PATCH V7 5/8] perf evsel: Add a backpointer to the evlist a evsel is in

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Fri, Aug 28, 2015 at 05:48:06AM -0400, Kan Liang escreveu:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> So that functions that deal primarily with an evsel to access
> information that concerns the whole evlist it is in.

Also already in my perf/core branch.
 
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Signed-off-by: Kan Liang <kan.liang@intel.com>
> ---
>  tools/perf/util/evlist.c | 2 ++
>  tools/perf/util/evsel.c  | 2 ++
>  tools/perf/util/evsel.h  | 4 ++++
>  3 files changed, 8 insertions(+)
> 
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 373f65b..a8cc440 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -98,6 +98,7 @@ static void perf_evlist__purge(struct perf_evlist *evlist)
>  
>  	evlist__for_each_safe(evlist, n, pos) {
>  		list_del_init(&pos->node);
> +		pos->evlist = NULL;
>  		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)
>  {
> +	entry->evlist = evlist;
>  	list_add_tail(&entry->node, &evlist->entries);
>  	entry->idx = evlist->nr_entries;
>  	entry->tracking = !entry->idx;
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index b096ef7..bac25f4 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -206,6 +206,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
>  	evsel->leader	   = evsel;
>  	evsel->unit	   = "";
>  	evsel->scale	   = 1.0;
> +	evsel->evlist	   = NULL;
>  	INIT_LIST_HEAD(&evsel->node);
>  	INIT_LIST_HEAD(&evsel->config_terms);
>  	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)
>  {
>  	assert(list_empty(&evsel->node));
> +	assert(evsel->evlist == NULL);
>  	perf_evsel__free_fd(evsel);
>  	perf_evsel__free_id(evsel);
>  	perf_evsel__free_config_terms(evsel);
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 93ac6b1..298e6bb 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -60,6 +60,9 @@ struct perf_evsel_config_term {
>  
>  /** 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,
>   *         so that when showing results in tools such as 'perf stat', we
>   *         show the name used, not some alias.
> @@ -73,6 +76,7 @@ struct perf_evsel_config_term {
>   */
>  struct perf_evsel {
>  	struct list_head	node;
> +	struct perf_evlist	*evlist;
>  	struct perf_event_attr	attr;
>  	char			*filter;
>  	struct xyarray		*fd;
> -- 
> 1.8.3.1