perf tools: Move clockid_res_ns under clock struct
Move the clockid_res_ns struct member to the clock struct, so we have the clock related stuff in one place. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Geneviève Bastien <gbastien@versatic.net> Cc: Ian Rogers <irogers@google.com> Cc: Jeremie Galarneau <jgalar@efficios.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lore.kernel.org/lkml/20200805093444.314999-5-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
d1e325cf40
commit
9d88a1a170
tools/perf
@ -1566,6 +1566,9 @@ static int record__init_clock(struct record *rec)
|
|||||||
if (!rec->opts.use_clockid)
|
if (!rec->opts.use_clockid)
|
||||||
return 0;
|
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;
|
session->header.env.clock.clockid = rec->opts.clockid;
|
||||||
|
|
||||||
if (gettimeofday(&ref_tod, NULL) != 0) {
|
if (gettimeofday(&ref_tod, NULL) != 0) {
|
||||||
@ -1675,9 +1678,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
|
|||||||
|
|
||||||
record__init_features(rec);
|
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) {
|
if (forks) {
|
||||||
err = perf_evlist__prepare_workload(rec->evlist, &opts->target,
|
err = perf_evlist__prepare_workload(rec->evlist, &opts->target,
|
||||||
argv, data->is_pipe,
|
argv, data->is_pipe,
|
||||||
|
@ -77,7 +77,6 @@ struct perf_env {
|
|||||||
struct numa_node *numa_nodes;
|
struct numa_node *numa_nodes;
|
||||||
struct memory_node *memory_nodes;
|
struct memory_node *memory_nodes;
|
||||||
unsigned long long memory_bsize;
|
unsigned long long memory_bsize;
|
||||||
u64 clockid_res_ns;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* bpf_info_lock protects bpf rbtrees. This is needed because the
|
* bpf_info_lock protects bpf rbtrees. This is needed because the
|
||||||
@ -105,6 +104,7 @@ struct perf_env {
|
|||||||
struct {
|
struct {
|
||||||
u64 tod_ns;
|
u64 tod_ns;
|
||||||
u64 clockid_ns;
|
u64 clockid_ns;
|
||||||
|
u64 clockid_res_ns;
|
||||||
int clockid;
|
int clockid;
|
||||||
/*
|
/*
|
||||||
* enabled is valid for report mode, and is true if above
|
* enabled is valid for report mode, and is true if above
|
||||||
|
@ -892,8 +892,8 @@ static int write_auxtrace(struct feat_fd *ff,
|
|||||||
static int write_clockid(struct feat_fd *ff,
|
static int write_clockid(struct feat_fd *ff,
|
||||||
struct evlist *evlist __maybe_unused)
|
struct evlist *evlist __maybe_unused)
|
||||||
{
|
{
|
||||||
return do_write(ff, &ff->ph->env.clockid_res_ns,
|
return do_write(ff, &ff->ph->env.clock.clockid_res_ns,
|
||||||
sizeof(ff->ph->env.clockid_res_ns));
|
sizeof(ff->ph->env.clock.clockid_res_ns));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int write_clock_data(struct feat_fd *ff,
|
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)
|
static void print_clockid(struct feat_fd *ff, FILE *fp)
|
||||||
{
|
{
|
||||||
fprintf(fp, "# clockid frequency: %"PRIu64" MHz\n",
|
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)
|
static void print_clock_data(struct feat_fd *ff, FILE *fp)
|
||||||
@ -2810,7 +2810,7 @@ out:
|
|||||||
static int process_clockid(struct feat_fd *ff,
|
static int process_clockid(struct feat_fd *ff,
|
||||||
void *data __maybe_unused)
|
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 -1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user