[tip:perf/core] perf cgroup: Introduce find_cgroup() method

From: tip-bot for Arnaldo Carvalho de Melo
Date: Fri Mar 09 2018 - 03:36:30 EST


Commit-ID: b80271f76ac5fe498f8fb701b2745dcd841627cc
Gitweb: https://git.kernel.org/tip/b80271f76ac5fe498f8fb701b2745dcd841627cc
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Tue, 6 Mar 2018 10:27:00 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 7 Mar 2018 10:22:25 -0300

perf cgroup: Introduce find_cgroup() method

To break down complexity in add_cgroup().

Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: https://lkml.kernel.org/n/tip-5yqshcf5hm837n7c86u7lhjf@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/cgroup.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index 8ea964461eb7..84dfc34a6d0f 100644
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -90,11 +90,10 @@ static int open_cgroup(char *name)
return fd;
}

-static int add_cgroup(struct perf_evlist *evlist, char *str)
+static struct cgroup *evlist__find_cgroup(struct perf_evlist *evlist, char *str)
{
struct perf_evsel *counter;
struct cgroup *cgrp = NULL;
- int n;
/*
* check if cgrp is already defined, if so we reuse it
*/
@@ -107,6 +106,15 @@ static int add_cgroup(struct perf_evlist *evlist, char *str)
}
}

+ return cgrp;
+}
+
+static int add_cgroup(struct perf_evlist *evlist, char *str)
+{
+ struct perf_evsel *counter;
+ struct cgroup *cgrp = evlist__find_cgroup(evlist, str);
+ int n;
+
if (!cgrp) {
cgrp = zalloc(sizeof(*cgrp));
if (!cgrp)