xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf annotate: __symbol__inc_addr_samples() needs just annotated_source

Browse Source 
It only operates on the histograms, so no need for the encompassing
'struct annotation'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-2se2v7rrjil0kwqywks04ey2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2018-05-24 16:28:29 -03:00
parent be3e26d99c
commit e1a91a834d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/util/annotate.c
View File

@@ -819,7 +819,7 @@ static int __symbol__account_cycles(struct cyc_hist *ch,
} }
static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map,
struct annotation *notes, int evidx, u64 addr, struct annotated_source *src, int evidx, u64 addr,
struct perf_sample *sample) struct perf_sample *sample)
{ {
unsigned offset; unsigned offset;
@@ -835,7 +835,7 @@ static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map,
} }
offset = addr - sym->start; offset = addr - sym->start;
h = annotation__histogram(notes, evidx); h = annotated_source__histogram(src, evidx);
h->nr_samples++; h->nr_samples++;
h->addr[offset].nr_samples++; h->addr[offset].nr_samples++;
h->period += sample->period; h->period += sample->period;
@@ -874,7 +874,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
notes = symbol__get_annotation(sym, false); notes = symbol__get_annotation(sym, false);
if (notes == NULL) if (notes == NULL)
return -ENOMEM; return -ENOMEM;
return __symbol__inc_addr_samples(sym, map, notes, evsel->idx, addr, sample); return __symbol__inc_addr_samples(sym, map, notes->src, evsel->idx, addr, sample);
} }
static int symbol__account_cycles(u64 addr, u64 start, static int symbol__account_cycles(u64 addr, u64 start,

8
tools/perf/util/annotate.h
View File

@@ -267,10 +267,14 @@ void annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym)
void annotation__update_column_widths(struct annotation *notes); void annotation__update_column_widths(struct annotation *notes);
void annotation__init_column_widths(struct annotation *notes, struct symbol *sym); void annotation__init_column_widths(struct annotation *notes, struct symbol *sym);
static inline struct sym_hist *annotated_source__histogram(struct annotated_source *src, int idx)
{
return ((void *)src->histograms) + (src->sizeof_sym_hist * idx);
}
static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx) static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)
{ {
return (((void *)notes->src->histograms) + return annotated_source__histogram(notes->src, idx);
(notes->src->sizeof_sym_hist * idx));
} }
static inline struct annotation *symbol__annotation(struct symbol *sym) static inline struct annotation *symbol__annotation(struct symbol *sym)