From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
"Ingo Molnar" <mingo@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Michael Petlan" <mpetlan@redhat.com>,
"Ian Rogers" <irogers@google.com>,
"Andi Kleen" <ak@linux.intel.com>,
"David Ahern" <dsahern@gmail.com>,
"Geneviève Bastien" <gbastien@versatic.net>,
"Wang Nan" <wangnan0@huawei.com>,
"Jeremie Galarneau" <jgalar@efficios.com>
Subject: Re: [PATCH v2 4/7] perf tools: Move clockid_res_ns under clock struct
Date: Thu, 6 Aug 2020 09:42:58 -0300 [thread overview]
Message-ID: <20200806124258.GF71359@kernel.org> (raw)
In-Reply-To: <20200805093444.314999-5-jolsa@kernel.org>
Em Wed, Aug 05, 2020 at 11:34:41AM +0200, Jiri Olsa escreveu:
> Moving clockid_res_ns under clock struct, so we have
> clock related stuff in one place.
Thanks, applied.
- Arnaldo
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/builtin-record.c | 6 +++---
> tools/perf/util/env.h | 2 +-
> tools/perf/util/header.c | 8 ++++----
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 48d721af0096..c0f845021a16 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -1566,6 +1566,9 @@ static int record__init_clock(struct record *rec)
> if (!rec->opts.use_clockid)
> return 0;
>
> + if (rec->opts.use_clockid && rec->opts.clockid_res_ns)
> + session->header.env.clock.clockid_res_ns = rec->opts.clockid_res_ns;
> +
> session->header.env.clock.clockid = rec->opts.clockid;
>
> if (gettimeofday(&ref_tod, NULL) != 0) {
> @@ -1674,9 +1677,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
>
> record__init_features(rec);
>
> - if (rec->opts.use_clockid && rec->opts.clockid_res_ns)
> - session->header.env.clockid_res_ns = rec->opts.clockid_res_ns;
> -
> if (forks) {
> err = perf_evlist__prepare_workload(rec->evlist, &opts->target,
> argv, data->is_pipe,
> diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
> index 7218f7db57af..a12972652006 100644
> --- a/tools/perf/util/env.h
> +++ b/tools/perf/util/env.h
> @@ -77,7 +77,6 @@ struct perf_env {
> struct numa_node *numa_nodes;
> struct memory_node *memory_nodes;
> unsigned long long memory_bsize;
> - u64 clockid_res_ns;
>
> /*
> * bpf_info_lock protects bpf rbtrees. This is needed because the
> @@ -105,6 +104,7 @@ struct perf_env {
> struct {
> u64 tod_ns;
> u64 clockid_ns;
> + u64 clockid_res_ns;
> int clockid;
> /*
> * enabled is valid for report mode, and is true if above
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index eece94cf6f86..251faa9a5789 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -892,8 +892,8 @@ static int write_auxtrace(struct feat_fd *ff,
> static int write_clockid(struct feat_fd *ff,
> struct evlist *evlist __maybe_unused)
> {
> - return do_write(ff, &ff->ph->env.clockid_res_ns,
> - sizeof(ff->ph->env.clockid_res_ns));
> + return do_write(ff, &ff->ph->env.clock.clockid_res_ns,
> + sizeof(ff->ph->env.clock.clockid_res_ns));
> }
>
> static int write_clock_data(struct feat_fd *ff,
> @@ -1581,7 +1581,7 @@ static void print_cpu_topology(struct feat_fd *ff, FILE *fp)
> static void print_clockid(struct feat_fd *ff, FILE *fp)
> {
> fprintf(fp, "# clockid frequency: %"PRIu64" MHz\n",
> - ff->ph->env.clockid_res_ns * 1000);
> + ff->ph->env.clock.clockid_res_ns * 1000);
> }
>
> static void print_clock_data(struct feat_fd *ff, FILE *fp)
> @@ -2810,7 +2810,7 @@ static int process_mem_topology(struct feat_fd *ff,
> static int process_clockid(struct feat_fd *ff,
> void *data __maybe_unused)
> {
> - if (do_read_u64(ff, &ff->ph->env.clockid_res_ns))
> + if (do_read_u64(ff, &ff->ph->env.clock.clockid_res_ns))
> return -1;
>
> return 0;
> --
> 2.25.4
>
--
- Arnaldo
next prev parent reply other threads:[~2020-08-06 17:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 9:34 [PATCH v2 0/7] perf tools: Add wallclock time conversion support Jiri Olsa
2020-08-05 9:34 ` [PATCH v2 1/7] perf tools: Move parse_clockid into clockid object Jiri Olsa
2020-08-06 12:33 ` Arnaldo Carvalho de Melo
2020-08-05 9:34 ` [PATCH v2 2/7] perf tools: Add clockid_name function Jiri Olsa
2020-08-05 9:34 ` [PATCH v2 3/7] perf tools: Store clock references for -k/--clockid option Jiri Olsa
2020-08-06 12:42 ` Arnaldo Carvalho de Melo
2020-08-05 9:34 ` [PATCH v2 4/7] perf tools: Move clockid_res_ns under clock struct Jiri Olsa
2020-08-06 12:42 ` Arnaldo Carvalho de Melo [this message]
2020-08-05 9:34 ` [PATCH v2 5/7] perf tools: Add support to store time of day in CTF data conversion Jiri Olsa
2020-08-06 12:46 ` Arnaldo Carvalho de Melo
2020-08-05 9:34 ` [PATCH v2 6/7] perf script: Change enum perf_output_field values to be 64 bits Jiri Olsa
2020-08-06 12:46 ` Arnaldo Carvalho de Melo
2020-08-05 9:34 ` [PATCH v2 7/7] perf script: Add tod field to display time of day Jiri Olsa
2020-08-06 12:46 ` Arnaldo Carvalho de Melo
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=20200806124258.GF71359@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=gbastien@versatic.net \
--cc=irogers@google.com \
--cc=jgalar@efficios.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
/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