[PATCH 18/44] perf annotate: Rename hist to sym_hist in annotation__calc_percent

From: Arnaldo Carvalho de Melo
Date: Thu Aug 09 2018 - 11:00:06 EST


From: Jiri Olsa <jolsa@xxxxxxxxxx>

We will need to bring in 'struct hists' variable in this scope, so it's
better we do this rename first.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/20180804130521.11408-7-jolsa@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/annotate.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 8bd278a71004..728603636adc 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1753,7 +1753,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
goto out_free_command;
}

-static void calc_percent(struct sym_hist *hist,
+static void calc_percent(struct sym_hist *sym_hist,
struct annotation_data *data,
s64 offset, s64 end)
{
@@ -1761,15 +1761,15 @@ static void calc_percent(struct sym_hist *hist,
u64 period = 0;

while (offset < end) {
- hits += hist->addr[offset].nr_samples;
- period += hist->addr[offset].period;
+ hits += sym_hist->addr[offset].nr_samples;
+ period += sym_hist->addr[offset].period;
++offset;
}

- if (hist->nr_samples) {
+ if (sym_hist->nr_samples) {
data->he.period = period;
data->he.nr_samples = hits;
- data->percent = 100.0 * hits / hist->nr_samples;
+ data->percent = 100.0 * hits / sym_hist->nr_samples;
}
}

@@ -1790,12 +1790,12 @@ static void annotation__calc_percent(struct annotation *notes,

for (i = 0; i < al->data_nr; i++) {
struct annotation_data *data;
- struct sym_hist *hist;
+ struct sym_hist *sym_hist;

- hist = annotation__histogram(notes, evsel->idx + i);
+ sym_hist = annotation__histogram(notes, evsel->idx + i);
data = &al->data[i];

- calc_percent(hist, data, al->offset, end);
+ calc_percent(sym_hist, data, al->offset, end);
}
}
}
--
2.14.4