diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2014-11-21 04:31:11 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-12-01 18:00:30 -0500 |
| commit | a5a7fd76b55a6e6916ff22e5c8fdb39a8381be2c (patch) | |
| tree | d0903cb536b4c841f04cd799bf36205888f52288 /tools/perf | |
| parent | 1971f59f1a1e0e7f3efc25ce0597505626d9f7ed (diff) | |
perf tools: Remove perf_evsel__read interface
Removing the perf_evsel__read interfaces because we replaced the only
user in the stat command code.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1416562275-12404-8-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/evsel.c | 34 | ||||
| -rw-r--r-- | tools/perf/util/evsel.h | 29 |
2 files changed, 0 insertions, 63 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2d26b7ad6fe0..1e90c8557ede 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -954,40 +954,6 @@ int __perf_evsel__read_on_cpu(struct perf_evsel *evsel, | |||
| 954 | return 0; | 954 | return 0; |
| 955 | } | 955 | } |
| 956 | 956 | ||
| 957 | int __perf_evsel__read(struct perf_evsel *evsel, | ||
| 958 | int ncpus, int nthreads, bool scale) | ||
| 959 | { | ||
| 960 | size_t nv = scale ? 3 : 1; | ||
| 961 | int cpu, thread; | ||
| 962 | struct perf_counts_values *aggr = &evsel->counts->aggr, count; | ||
| 963 | |||
| 964 | if (evsel->system_wide) | ||
| 965 | nthreads = 1; | ||
| 966 | |||
| 967 | aggr->val = aggr->ena = aggr->run = 0; | ||
| 968 | |||
| 969 | for (cpu = 0; cpu < ncpus; cpu++) { | ||
| 970 | for (thread = 0; thread < nthreads; thread++) { | ||
| 971 | if (FD(evsel, cpu, thread) < 0) | ||
| 972 | continue; | ||
| 973 | |||
| 974 | if (readn(FD(evsel, cpu, thread), | ||
| 975 | &count, nv * sizeof(u64)) < 0) | ||
| 976 | return -errno; | ||
| 977 | |||
| 978 | aggr->val += count.val; | ||
| 979 | if (scale) { | ||
| 980 | aggr->ena += count.ena; | ||
| 981 | aggr->run += count.run; | ||
| 982 | } | ||
| 983 | } | ||
| 984 | } | ||
| 985 | |||
| 986 | perf_evsel__compute_deltas(evsel, -1, aggr); | ||
| 987 | perf_counts_values__scale(aggr, scale, &evsel->counts->scaled); | ||
| 988 | return 0; | ||
| 989 | } | ||
| 990 | |||
| 991 | static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread) | 957 | static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread) |
| 992 | { | 958 | { |
| 993 | struct perf_evsel *leader = evsel->leader; | 959 | struct perf_evsel *leader = evsel->leader; |
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index b18d58da580b..3207f4861038 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h | |||
| @@ -271,35 +271,6 @@ static inline int perf_evsel__read_on_cpu_scaled(struct perf_evsel *evsel, | |||
| 271 | return __perf_evsel__read_on_cpu(evsel, cpu, thread, true); | 271 | return __perf_evsel__read_on_cpu(evsel, cpu, thread, true); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | int __perf_evsel__read(struct perf_evsel *evsel, int ncpus, int nthreads, | ||
| 275 | bool scale); | ||
| 276 | |||
| 277 | /** | ||
| 278 | * perf_evsel__read - Read the aggregate results on all CPUs | ||
| 279 | * | ||
| 280 | * @evsel - event selector to read value | ||
| 281 | * @ncpus - Number of cpus affected, from zero | ||
| 282 | * @nthreads - Number of threads affected, from zero | ||
| 283 | */ | ||
| 284 | static inline int perf_evsel__read(struct perf_evsel *evsel, | ||
| 285 | int ncpus, int nthreads) | ||
| 286 | { | ||
| 287 | return __perf_evsel__read(evsel, ncpus, nthreads, false); | ||
| 288 | } | ||
| 289 | |||
| 290 | /** | ||
| 291 | * perf_evsel__read_scaled - Read the aggregate results on all CPUs, scaled | ||
| 292 | * | ||
| 293 | * @evsel - event selector to read value | ||
| 294 | * @ncpus - Number of cpus affected, from zero | ||
| 295 | * @nthreads - Number of threads affected, from zero | ||
| 296 | */ | ||
| 297 | static inline int perf_evsel__read_scaled(struct perf_evsel *evsel, | ||
| 298 | int ncpus, int nthreads) | ||
| 299 | { | ||
| 300 | return __perf_evsel__read(evsel, ncpus, nthreads, true); | ||
| 301 | } | ||
| 302 | |||
| 303 | int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, | 274 | int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, |
| 304 | struct perf_sample *sample); | 275 | struct perf_sample *sample); |
| 305 | 276 | ||
