diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-06-26 04:38:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-26 04:38:11 -0400 |
commit | 6eedf416429a32e0216f61b8b690d25577b2b91e (patch) | |
tree | cdd0474142283a269c2e05e31128d382418fab28 /tools/perf/builtin-stat.c | |
parent | df0d0da426d03fb7e6567feb38a48b1e0dd1891e (diff) | |
parent | a22e99cd74a31dee4b5241bd60a256c629c808da (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and refactorings from Arnaldo Carvalho de Melo:
Infrastructure changes:
- Reference count the cpu_map and thread_map classes. (Jiri Olsa)
- Set evsel->{cpus,threads} from the evlist, if not set,
allowing the generalization of some 'perf stat' functions that
previously were accessing private static evlist variable. (Jiri Olsa)
- Delete an unnecessary check before the calling
free_event_desc() (Markus Elfring)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-stat.c')
-rw-r--r-- | tools/perf/builtin-stat.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index fcf99bdeb19e..3e1636cae76b 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
@@ -141,16 +141,6 @@ static inline void diff_timespec(struct timespec *r, struct timespec *a, | |||
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | static inline struct cpu_map *perf_evsel__cpus(struct perf_evsel *evsel) | ||
145 | { | ||
146 | return (evsel->cpus && !target.cpu_list) ? evsel->cpus : evsel_list->cpus; | ||
147 | } | ||
148 | |||
149 | static inline int perf_evsel__nr_cpus(struct perf_evsel *evsel) | ||
150 | { | ||
151 | return perf_evsel__cpus(evsel)->nr; | ||
152 | } | ||
153 | |||
154 | static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel) | 144 | static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel) |
155 | { | 145 | { |
156 | int i; | 146 | int i; |