perf ftrace latency: Pass ftrace pointer to histogram routines to pass more args

The ftrace->use_nsec arg is being passed to both make_historgram() and
display_histogram(), since another ftrace field will be passed to those
functions in a followup patch, make them look like other functions in
this codebase that receive the 'struct perf_ftrace' pointer.

No change in logic.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Gabriele Monaco <gmonaco@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20241112181214.1171244-2-acme@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index 272d3c70810e7dc34c78c202b9e005384927955c..88b9f0597b925c69d9954a24ebcb8802043608e4 100644 (file)
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -726,8 +726,8 @@ out:
        return (done && !workload_exec_errno) ? 0 : -1;
 }
 
-static void make_histogram(int buckets[], char *buf, size_t len, char *linebuf,
-                          bool use_nsec)
+static void make_histogram(struct perf_ftrace *ftrace, int buckets[],
+                          char *buf, size_t len, char *linebuf)
 {
        char *p, *q;
        char *unit;
@@ -774,7 +774,7 @@ static void make_histogram(int buckets[], char *buf, size_t len, char *linebuf,
                if (!unit || strncmp(unit, " us", 3))
                        goto next;
 
-               if (use_nsec)
+               if (ftrace->use_nsec)
                        num *= 1000;
 
                i = log2(num);
@@ -794,8 +794,9 @@ next:
        strcat(linebuf, p);
 }
 
-static void display_histogram(int buckets[], bool use_nsec)
+static void display_histogram(struct perf_ftrace *ftrace, int buckets[])
 {
+       bool use_nsec = ftrace->use_nsec;
        int i;
        int total = 0;
        int bar_total = 46;  /* to fit in 80 column */
@@ -951,7 +952,7 @@ static int __cmd_latency(struct perf_ftrace *ftrace)
                        if (n < 0)
                                break;
 
-                       make_histogram(buckets, buf, n, line, ftrace->use_nsec);
+                       make_histogram(ftrace, buckets, buf, n, line);
                }
        }
 
@@ -968,12 +969,12 @@ static int __cmd_latency(struct perf_ftrace *ftrace)
                int n = read(trace_fd, buf, sizeof(buf) - 1);
                if (n <= 0)
                        break;
-               make_histogram(buckets, buf, n, line, ftrace->use_nsec);
+               make_histogram(ftrace, buckets, buf, n, line);
        }
 
        read_func_latency(ftrace, buckets);
 
-       display_histogram(buckets, ftrace->use_nsec);
+       display_histogram(ftrace, buckets);
 
 out:
        close(trace_fd);