[PATCH 3/6] perf tools: Move clockid_res_ns under clock struct

[Jiri Olsa]

Moving clockid_res_ns under clock struct, so we have
clock related stuff in one place.

Signed-off-by: Jiri Olsa <jo...@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 f8280e721e1a..955c621b0ff7 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1565,6 +1565,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) {
@@ -1673,9 +1676,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 4098a63d5e64..d50c0a3354e3 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 ffe10d8fd5fa..88151c5cf286 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -891,8 +891,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,
@@ -1580,7 +1580,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)
@@ -2809,7 +2809,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