Skip to content

Commit

Permalink
perf cgroup: Add evlist__findnew_cgroup()
Browse files Browse the repository at this point in the history
Similar to machine__findnew_thread(), etc, i.e. try to find, get a
refcount if found and return it, otherwise return a new cgroup object.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-im1omevlihhyneiic4nl3g24@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Mar 7, 2018
1 parent 4b5ea3b commit 69239ec
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
17 changes: 10 additions & 7 deletions tools/perf/util/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,21 @@ static struct cgroup *cgroup__new(char *name)
return NULL;
}

struct cgroup *evlist__findnew_cgroup(struct perf_evlist *evlist, char *name)
{
struct cgroup *cgroup = evlist__find_cgroup(evlist, name);

return cgroup ?: cgroup__new(name);
}

static int add_cgroup(struct perf_evlist *evlist, char *str)
{
struct perf_evsel *counter;
struct cgroup *cgrp = evlist__find_cgroup(evlist, str);
struct cgroup *cgrp = evlist__findnew_cgroup(evlist, str);
int n;

if (!cgrp) {
cgrp = cgroup__new(str);
if (!cgrp)
return -1;
}

if (!cgrp)
return -1;
/*
* find corresponding event
* if add cgroup N, then need to find event N
Expand Down
4 changes: 4 additions & 0 deletions tools/perf/util/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ extern int nr_cgroups; /* number of explicit cgroups defined */
struct cgroup *cgroup__get(struct cgroup *cgroup);
void cgroup__put(struct cgroup *cgroup);

struct perf_evlist;

struct cgroup *evlist__findnew_cgroup(struct perf_evlist *evlist, char *name);

int parse_cgroups(const struct option *opt, const char *str, int unset);

#endif /* __CGROUP_H__ */

0 comments on commit 69239ec

Please sign in to comment.