Messages in this thread | | | Date | Wed, 17 Nov 2021 11:57:28 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH v3 1/3] libperf: Move perf_counts_values__scale to tools/lib/perf |
| |
Em Sun, Nov 14, 2021 at 05:19:45PM +0100, Jiri Olsa escreveu: > On Tue, Nov 09, 2021 at 05:58:29PM +0900, Shunsuke Nakamura wrote: > > Move perf_counts_values__scale from tools/perf/util to tools/lib/perf > > so that it can be used with libperf. > > > > Signed-off-by: Shunsuke Nakamura <nakamura.shun@fujitsu.com> > > --- > > tools/lib/perf/evsel.c | 19 +++++++++++++++++++ > > tools/lib/perf/include/perf/evsel.h | 4 ++++ > > tools/lib/perf/libperf.map | 1 + > > tools/perf/util/evsel.c | 19 ------------------- > > tools/perf/util/evsel.h | 3 --- > > 5 files changed, 24 insertions(+), 22 deletions(-) > > > > diff --git a/tools/lib/perf/evsel.c b/tools/lib/perf/evsel.c > > index 8441e3e1aaac..5097aadea37a 100644 > > --- a/tools/lib/perf/evsel.c > > +++ b/tools/lib/perf/evsel.c > > @@ -431,3 +431,22 @@ void perf_evsel__free_id(struct perf_evsel *evsel) > > zfree(&evsel->id); > > evsel->ids = 0; > > } > > + > > +void perf_counts_values__scale(struct perf_counts_values *count, > > + bool scale, s8 *pscaled) > > +{ > > + s8 scaled = 0; > > + > > + if (scale) { > > + if (count->run == 0) { > > + scaled = -1; > > + count->val = 0; > > + } else if (count->run < count->ena) { > > + scaled = 1; > > + count->val = (u64)((double)count->val * count->ena / count->run); > > + } > > + } > > + > > + if (pscaled) > > + *pscaled = scaled; > > +} > > diff --git a/tools/lib/perf/include/perf/evsel.h b/tools/lib/perf/include/perf/evsel.h > > index 60eae25076d3..9013d73af22d 100644 > > --- a/tools/lib/perf/include/perf/evsel.h > > +++ b/tools/lib/perf/include/perf/evsel.h > > @@ -4,6 +4,8 @@ > > > > #include <stdint.h> > > #include <perf/core.h> > > +#include <stdbool.h> > > +#include <linux/types.h> > > > > struct perf_evsel; > > struct perf_event_attr; > > @@ -39,5 +41,7 @@ LIBPERF_API int perf_evsel__disable_cpu(struct perf_evsel *evsel, int cpu); > > LIBPERF_API struct perf_cpu_map *perf_evsel__cpus(struct perf_evsel *evsel); > > LIBPERF_API struct perf_thread_map *perf_evsel__threads(struct perf_evsel *evsel); > > LIBPERF_API struct perf_event_attr *perf_evsel__attr(struct perf_evsel *evsel); > > +LIBPERF_API void perf_counts_values__scale(struct perf_counts_values *count, > > + bool scale, s8 *pscaled); > > not sure if we should use __s8 for pscaled now when it's exported? > it's just we use it everywhere else with '__' prefix, I forgot what's > the difference actually ;-)
I'm moving this to be __s8, following what is being used in tools/lib/bpf/bpf.h.
> but other that all looks good, for the patchset: > > Acked-by: Jiri Olsa <jolsa@kernel.org> > > thanks, > jirka > > > > > > #endif /* __LIBPERF_EVSEL_H */ > > diff --git a/tools/lib/perf/libperf.map b/tools/lib/perf/libperf.map > > index 71468606e8a7..5979bf92d98f 100644 > > --- a/tools/lib/perf/libperf.map > > +++ b/tools/lib/perf/libperf.map > > @@ -50,6 +50,7 @@ LIBPERF_0.0.1 { > > perf_mmap__read_init; > > perf_mmap__read_done; > > perf_mmap__read_event; > > + perf_counts_values__scale; > > local: > > *; > > }; > > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > > index dbfeceb2546c..49e4d0bdd7cc 100644 > > --- a/tools/perf/util/evsel.c > > +++ b/tools/perf/util/evsel.c > > @@ -1457,25 +1457,6 @@ void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread, > > count->run = count->run - tmp.run; > > } > > > > -void perf_counts_values__scale(struct perf_counts_values *count, > > - bool scale, s8 *pscaled) > > -{ > > - s8 scaled = 0; > > - > > - if (scale) { > > - if (count->run == 0) { > > - scaled = -1; > > - count->val = 0; > > - } else if (count->run < count->ena) { > > - scaled = 1; > > - count->val = (u64)((double) count->val * count->ena / count->run); > > - } > > - } > > - > > - if (pscaled) > > - *pscaled = scaled; > > -} > > - > > static int evsel__read_one(struct evsel *evsel, int cpu, int thread) > > { > > struct perf_counts_values *count = perf_counts(evsel->counts, cpu, thread); > > diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h > > index 1f7edfa8568a..8a6a4182c5fd 100644 > > --- a/tools/perf/util/evsel.h > > +++ b/tools/perf/util/evsel.h > > @@ -190,9 +190,6 @@ static inline int evsel__nr_cpus(struct evsel *evsel) > > return evsel__cpus(evsel)->nr; > > } > > > > -void perf_counts_values__scale(struct perf_counts_values *count, > > - bool scale, s8 *pscaled); > > - > > void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread, > > struct perf_counts_values *count); > > > > -- > > 2.27.0 > >
--
- Arnaldo
| |