leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf annotate: Introduce annotated_source__alloc_histograms

Browse Source 
So that we can call it independently, in contexts were we know we
already have notes->src allocated.

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-f5fn7tr1asey6g013wavpn4c@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:23:08 -03:00
parent ca39650309
commit be3e26d99c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,10 +697,9 @@ static void annotated_source__delete(struct annotated_source *src)
free(src);
}
int symbol__alloc_hist(struct symbol *sym)
static int annotated_source__alloc_histograms(struct annotated_source *src,
size_t size, int nr_hists)
{
struct annotation *notes = symbol__annotation(sym);
size_t size = symbol__size(sym);
size_t sizeof_sym_hist;
/*
@ -720,20 +719,29 @@ int symbol__alloc_hist(struct symbol *sym)
sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(struct sym_hist_entry));
/* Check for overflow in zalloc argument */
if (sizeof_sym_hist > SIZE_MAX / symbol_conf.nr_events)
if (sizeof_sym_hist > SIZE_MAX / nr_hists)
return -1;
src->sizeof_sym_hist = sizeof_sym_hist;
src->nr_histograms = nr_hists;
src->histograms = calloc(nr_hists, sizeof_sym_hist) ;
return src->histograms ? 0 : -1;
}
int symbol__alloc_hist(struct symbol *sym)
{
size_t size = symbol__size(sym);
struct annotation *notes = symbol__annotation(sym);
notes->src = annotated_source__new();
if (notes->src == NULL)
return -1;
notes->src->histograms = calloc(symbol_conf.nr_events, sizeof_sym_hist);
if (notes->src->histograms == NULL) {
if (annotated_source__alloc_histograms(notes->src, size, symbol_conf.nr_events) < 0) {
annotated_source__delete(notes->src);
notes->src = NULL;
return -1;
}
notes->src->sizeof_sym_hist = sizeof_sym_hist;
notes->src->nr_histograms = symbol_conf.nr_events;
return 0;
}