[PATCH 06/54] perf cgroup: Introduce find_cgroup() method

From: Arnaldo Carvalho de Melo
Date: Thu Mar 08 2018 - 15:06:51 EST


From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

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)
--
2.14.3