From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751981AbeCIIef (ORCPT ); Fri, 9 Mar 2018 03:34:35 -0500 Received: from terminus.zytor.com ([198.137.202.136]:54701 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751333AbeCIIed (ORCPT ); Fri, 9 Mar 2018 03:34:33 -0500 Date: Fri, 9 Mar 2018 00:34:22 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, wangnan0@huawei.com, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, adrian.hunter@intel.com, dsahern@gmail.com, eranian@google.com, tglx@linutronix.de, namhyung@kernel.org Reply-To: namhyung@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, dsahern@gmail.com, acme@redhat.com, eranian@google.com, jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com, mingo@kernel.org, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf cgroup: Rename 'struct cgroup_sel' to 'struct cgroup' Git-Commit-ID: 3ca32f69592be4d667c701763335fa496a0ede1d 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 Commit-ID: 3ca32f69592be4d667c701763335fa496a0ede1d Gitweb: https://git.kernel.org/tip/3ca32f69592be4d667c701763335fa496a0ede1d Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 6 Mar 2018 09:51:48 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 7 Mar 2018 10:22:25 -0300 perf cgroup: Rename 'struct cgroup_sel' to 'struct cgroup' That name isn't used, is shorter, lets switch to it. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-e51yphwgvepd1y4f5fjptmjq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cgroup.c | 6 +++--- tools/perf/util/cgroup.h | 5 +++-- tools/perf/util/evsel.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 2e2aa6c86107..6ce291f45f2d 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -93,7 +93,7 @@ static int open_cgroup(char *name) static int add_cgroup(struct perf_evlist *evlist, char *str) { struct perf_evsel *counter; - struct cgroup_sel *cgrp = NULL; + struct cgroup *cgrp = NULL; int n; /* * check if cgrp is already defined, if so we reuse it @@ -144,7 +144,7 @@ found: return 0; } -void close_cgroup(struct cgroup_sel *cgrp) +void close_cgroup(struct cgroup *cgrp) { if (cgrp && refcount_dec_and_test(&cgrp->refcnt)) { close(cgrp->fd); @@ -158,7 +158,7 @@ int parse_cgroups(const struct option *opt, const char *str, { struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; struct perf_evsel *counter; - struct cgroup_sel *cgrp = NULL; + struct cgroup *cgrp = NULL; const char *p, *e, *eos = str + strlen(str); char *s; int ret, i; diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h index afafc87e9201..934daa8e4c19 100644 --- a/tools/perf/util/cgroup.h +++ b/tools/perf/util/cgroup.h @@ -6,7 +6,7 @@ struct option; -struct cgroup_sel { +struct cgroup { char *name; int fd; refcount_t refcnt; @@ -14,7 +14,8 @@ struct cgroup_sel { extern int nr_cgroups; /* number of explicit cgroups defined */ -void close_cgroup(struct cgroup_sel *cgrp); +void close_cgroup(struct cgroup *cgrp); + int parse_cgroups(const struct option *opt, const char *str, int unset); #endif /* __CGROUP_H__ */ diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a7487c6d1866..92ba001b627f 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -30,7 +30,7 @@ struct perf_sample_id { u64 period; }; -struct cgroup_sel; +struct cgroup; /* * The 'struct perf_evsel_config_term' is used to pass event @@ -107,7 +107,7 @@ struct perf_evsel { struct perf_stat_evsel *stats; void *priv; u64 db_id; - struct cgroup_sel *cgrp; + struct cgroup *cgrp; void *handler; struct cpu_map *cpus; struct cpu_map *own_cpus;