Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752910AbbHaIc1 (ORCPT ); Mon, 31 Aug 2015 04:32:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37867 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbbHaIcZ (ORCPT ); Mon, 31 Aug 2015 04:32:25 -0400 Date: Mon, 31 Aug 2015 01:32:01 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mark.rutland@arm.com, ak@linux.intel.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, kan.liang@intel.com, eranian@google.com, acme@redhat.com, tglx@linutronix.de, luto@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, a.p.zijlstra@chello.nl Reply-To: linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, ak@linux.intel.com, mark.rutland@arm.com, hpa@zytor.com, adrian.hunter@intel.com, luto@kernel.org, jolsa@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, acme@redhat.com, kan.liang@intel.com, eranian@google.com In-Reply-To: <1440677263-21954-5-git-send-email-kan.liang@intel.com> References: <1440677263-21954-5-git-send-email-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Add a backpointer to the evlist a evsel is in Git-Commit-ID: d49e4695077278ee3016cd242967de23072ec331 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3670 Lines: 97 Commit-ID: d49e4695077278ee3016cd242967de23072ec331 Gitweb: http://git.kernel.org/tip/d49e4695077278ee3016cd242967de23072ec331 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 27 Aug 2015 08:07:40 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 28 Aug 2015 14:53:49 -0300 perf evsel: Add a backpointer to the evlist a evsel is in So that functions that deal primarily with an evsel to access information that concerns the whole evlist it is in. Cc: Adrian Hunter Cc: Andi Kleen Cc: Andy Lutomirski Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1440677263-21954-5-git-send-email-kan.liang@intel.com Signed-off-by: Kan Liang Signed-off-by: Arnaldo Carvalho de Melo --- 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 e9a5d43..8d00039 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/