From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 11/30] perf tools: Move perf_evsel__(alloc|free|reset)_counts into stat object
Date: Mon, 15 Jun 2015 17:13:45 -0300 [thread overview]
Message-ID: <20150615201345.GH5845@kernel.org> (raw)
In-Reply-To: <1434269985-521-12-git-send-email-jolsa@kernel.org>
Em Sun, Jun 14, 2015 at 10:19:26AM +0200, Jiri Olsa escreveu:
> It's stat specific. Updating python build objects with stat.c.
>
> Link: http://lkml.kernel.org/n/tip-36bz60viixc7bd5vh8oywazc@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
thanks, applied.
- Arnaldo
> ---
> tools/perf/tests/openat-syscall-all-cpus.c | 1 +
> tools/perf/util/evsel.c | 19 +------------------
> tools/perf/util/evsel.h | 3 ---
> tools/perf/util/python-ext-sources | 1 +
> tools/perf/util/stat.c | 18 ++++++++++++++++++
> tools/perf/util/stat.h | 3 +++
> 6 files changed, 24 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
> index 8801983a38f0..b8d552b13950 100644
> --- a/tools/perf/tests/openat-syscall-all-cpus.c
> +++ b/tools/perf/tests/openat-syscall-all-cpus.c
> @@ -3,6 +3,7 @@
> #include "thread_map.h"
> #include "cpumap.h"
> #include "debug.h"
> +#include "stat.h"
>
> int test__openat_syscall_event_on_all_cpus(void)
> {
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 6ef818475aa3..1b2f480a3e82 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -26,6 +26,7 @@
> #include "perf_regs.h"
> #include "debug.h"
> #include "trace-event.h"
> +#include "stat.h"
>
> static struct {
> bool sample_id_all;
> @@ -851,19 +852,6 @@ int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads)
> return 0;
> }
>
> -void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus)
> -{
> - memset(evsel->counts, 0, (sizeof(*evsel->counts) +
> - (ncpus * sizeof(struct perf_counts_values))));
> -}
> -
> -int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus)
> -{
> - evsel->counts = zalloc((sizeof(*evsel->counts) +
> - (ncpus * sizeof(struct perf_counts_values))));
> - return evsel->counts != NULL ? 0 : -ENOMEM;
> -}
> -
> static void perf_evsel__free_fd(struct perf_evsel *evsel)
> {
> xyarray__delete(evsel->fd);
> @@ -891,11 +879,6 @@ void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
> }
> }
>
> -void perf_evsel__free_counts(struct perf_evsel *evsel)
> -{
> - zfree(&evsel->counts);
> -}
> -
> void perf_evsel__exit(struct perf_evsel *evsel)
> {
> assert(list_empty(&evsel->node));
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 54afdc80a651..4dbf32d94dfb 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -182,9 +182,6 @@ const char *perf_evsel__group_name(struct perf_evsel *evsel);
> int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size);
>
> int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads);
> -int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus);
> -void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus);
> -void perf_evsel__free_counts(struct perf_evsel *evsel);
> void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
>
> void __perf_evsel__set_sample_bit(struct perf_evsel *evsel,
> diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
> index 55ba8968a263..572d39ab7bdf 100644
> --- a/tools/perf/util/python-ext-sources
> +++ b/tools/perf/util/python-ext-sources
> @@ -20,3 +20,4 @@ util/strlist.c
> util/trace-event.c
> ../../lib/rbtree.c
> util/string.c
> +util/stat.c
> diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
> index 60b92822f655..ac589b6b8bce 100644
> --- a/tools/perf/util/stat.c
> +++ b/tools/perf/util/stat.c
> @@ -94,3 +94,21 @@ void perf_stat_evsel_id_init(struct perf_evsel *evsel)
> }
> }
> }
> +
> +void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus)
> +{
> + memset(evsel->counts, 0, (sizeof(*evsel->counts) +
> + (ncpus * sizeof(struct perf_counts_values))));
> +}
> +
> +int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus)
> +{
> + evsel->counts = zalloc((sizeof(*evsel->counts) +
> + (ncpus * sizeof(struct perf_counts_values))));
> + return evsel->counts != NULL ? 0 : -ENOMEM;
> +}
> +
> +void perf_evsel__free_counts(struct perf_evsel *evsel)
> +{
> + zfree(&evsel->counts);
> +}
> diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
> index 615c779eb42a..6a782601c1c7 100644
> --- a/tools/perf/util/stat.h
> +++ b/tools/perf/util/stat.h
> @@ -62,4 +62,7 @@ void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 *count,
> void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel,
> double avg, int cpu, enum aggr_mode aggr);
>
> +void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus);
> +int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus);
> +void perf_evsel__free_counts(struct perf_evsel *evsel);
> #endif
> --
> 1.9.3
next prev parent reply other threads:[~2015-06-15 20:16 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-14 8:19 [PATCHv2 00/30] perf stat: Introduce --per-task option Jiri Olsa
2015-06-14 8:19 ` [PATCH 01/30] perf tools: Introduce xyarray__reset function Jiri Olsa
2015-06-18 8:13 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-06-14 8:19 ` [PATCH 02/30] perf tools: Add thread_map__(alloc|realloc) helpers Jiri Olsa
2015-06-18 8:14 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-06-14 8:19 ` [PATCH 03/30] perf tools: Change thread_map::map into struct Jiri Olsa
2015-06-15 19:04 ` Arnaldo Carvalho de Melo
2015-06-15 21:33 ` Jiri Olsa
2015-06-14 8:19 ` [PATCH 04/30] perf tools: Add comm string into struct thread_map Jiri Olsa
2015-06-15 19:17 ` Arnaldo Carvalho de Melo
2015-06-15 21:55 ` Jiri Olsa
2015-06-14 8:19 ` [PATCH 05/30] perf tests: Add thread_map object tests Jiri Olsa
2015-06-14 8:19 ` [PATCH 06/30] perf tools: Add reference counting for cpu_map object Jiri Olsa
2015-06-14 8:19 ` [PATCH 07/30] perf tools: Add reference counting for thread_map object Jiri Olsa
2015-06-15 19:25 ` Arnaldo Carvalho de Melo
2015-06-15 21:28 ` Jiri Olsa
2015-06-14 8:19 ` [PATCH 08/30] perf tools: Propagate cpu maps through the evlist Jiri Olsa
2015-06-15 19:34 ` Arnaldo Carvalho de Melo
2015-06-15 21:29 ` Jiri Olsa
2015-06-14 8:19 ` [PATCH 09/30] perf tools: Propagate thread " Jiri Olsa
2015-06-14 8:19 ` [PATCH 10/30] perf tools: Make perf_evsel__(nr_)cpus generic Jiri Olsa
2015-06-14 8:19 ` [PATCH 11/30] perf tools: Move perf_evsel__(alloc|free|reset)_counts into stat object Jiri Olsa
2015-06-15 20:13 ` Arnaldo Carvalho de Melo [this message]
2015-06-18 8:14 ` [tip:perf/core] perf tools: Move perf_evsel__(alloc|free|reset) _counts " tip-bot for Jiri Olsa
2015-06-14 8:19 ` [PATCH 12/30] perf stat: Introduce perf_counts__(alloc|free|reset) functions Jiri Olsa
2015-06-15 20:16 ` Arnaldo Carvalho de Melo
2015-06-18 8:14 ` [tip:perf/core] perf stat: Introduce perf_counts__( new|delete|reset) functions tip-bot for Jiri Olsa
2015-06-14 8:19 ` [PATCH 13/30] perf stat: Introduce perf_counts function Jiri Olsa
2015-06-14 8:19 ` [PATCH 14/30] perf stat: Use xyarray for cpu evsel counts Jiri Olsa
2015-06-14 8:19 ` [PATCH 15/30] perf stat: Make stats work over the thread dimension Jiri Olsa
2015-06-14 8:19 ` [PATCH 16/30] perf stat: Rename struct perf_counts::cpu member to values Jiri Olsa
2015-06-14 8:19 ` [PATCH 17/30] perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object Jiri Olsa
2015-06-14 8:19 ` [PATCH 18/30] perf stat: Move perf_evsel__(alloc|free)_prev_raw_counts " Jiri Olsa
2015-06-14 8:19 ` [PATCH 19/30] perf stat: Move perf_evlist__(alloc|free)_stats into evlist object Jiri Olsa
2015-06-14 8:19 ` [PATCH 20/30] perf stat: Introduce perf_evsel__alloc_stats function Jiri Olsa
2015-06-14 8:19 ` [PATCH 21/30] perf stat: Introduce perf_evsel__read function Jiri Olsa
2015-06-14 8:19 ` [PATCH 22/30] perf stat: Introduce read_counters function Jiri Olsa
2015-06-14 8:19 ` [PATCH 23/30] perf stat: Separate counters reading and processing Jiri Olsa
2015-06-14 8:19 ` [PATCH 24/30] perf stat: Move zero_per_pkg into counter process code Jiri Olsa
2015-06-14 8:19 ` [PATCH 25/30] perf stat: Move perf_stat initialization " Jiri Olsa
2015-06-14 8:19 ` [PATCH 26/30] perf stat: Remove perf_evsel__read_cb function Jiri Olsa
2015-06-14 8:19 ` [PATCH 27/30] perf stat: Rename print_interval to process_interval Jiri Olsa
2015-06-14 8:19 ` [PATCH 28/30] perf stat: Using init_stats instead of memset Jiri Olsa
2015-06-14 8:19 ` [PATCH 29/30] perf stat: Introduce print_counters function Jiri Olsa
2015-06-14 8:19 ` [PATCH 30/30] perf stat: Introduce --per-task option Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150615201345.GH5845@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).